Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst
===================================================================
diff -u -re81180a9102bfeac05c414ce8e5b68ca43de0d00 -rf4be03afe960aed126b5a71a469e69ac4a8446a4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst	(.../AutomatedSystemTests.rxtst)	(revision e81180a9102bfeac05c414ce8e5b68ca43de0d00)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.rxtst	(.../AutomatedSystemTests.rxtst)	(revision f4be03afe960aed126b5a71a469e69ac4a8446a4)
@@ -13833,17 +13833,17 @@
 							</testmodule>
 						</setup>
 						<smartfoldernode
+						id="45d2f6ef-eb2f-4b9d-a62f-c65e74e99199"
+						name="OpenProject">
+							<testmodule
+							id="44fb608c-ed2e-4c8b-bd2a-d3d3cc587012"
+							name="OpenProject">
+							</testmodule>
+						</smartfoldernode>
+						<smartfoldernode
 						id="37c431a5-f03b-4cc9-a737-a950832cd9bc"
 						name="a)WaterLevelsAndWaveConditionsTrajectAndFM(GEBU)">
 							<smartfoldernode
-							id="45d2f6ef-eb2f-4b9d-a62f-c65e74e99199"
-							name="OpenProject">
-								<testmodule
-								id="44fb608c-ed2e-4c8b-bd2a-d3d3cc587012"
-								name="OpenProject">
-								</testmodule>
-							</smartfoldernode>
-							<smartfoldernode
 							id="0c083a22-60f2-4670-ae4c-5c16796e6423"
 							name="SelectCaseToRun">
 								<testmodule
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/SelectGenericItemInProjectExplorer.UserCode.cs
===================================================================
diff -u -r77350fe3ea49ac113d98a24c817657ffcb63a72c -rf4be03afe960aed126b5a71a469e69ac4a8446a4
--- System tests/AutomatedSystemTests/AutomatedSystemTests/SelectGenericItemInProjectExplorer.UserCode.cs	(.../SelectGenericItemInProjectExplorer.UserCode.cs)	(revision 77350fe3ea49ac113d98a24c817657ffcb63a72c)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/SelectGenericItemInProjectExplorer.UserCode.cs	(.../SelectGenericItemInProjectExplorer.UserCode.cs)	(revision f4be03afe960aed126b5a71a469e69ac4a8446a4)
@@ -53,11 +53,13 @@
         				stepChild = children.FirstOrDefault(ch => NameOfTreeItem(ch.As<TreeItem>())==step).As<TreeItem>();
         			}
         			stepChild.Focus();
-        			stepChild.Select();
         			if (i != stepsPathItem.Count - 1)
         				{
         				stepChild.Expand();
         				}
+        			else {
+        				stepChild.Click();
+        			}
         			// Update the children
         			children = stepChild.Children;
         			}