diff --git a/src/androidTest/java/de/blau/android/easyedit/NodeTest.java b/src/androidTest/java/de/blau/android/easyedit/NodeTest.java
index 6403ca8cd..ade4eb335 100644
--- a/src/androidTest/java/de/blau/android/easyedit/NodeTest.java
+++ b/src/androidTest/java/de/blau/android/easyedit/NodeTest.java
@@ -150,6 +150,7 @@ public void dragNode() {
     public void unjoinMergeWays() {
         TestUtils.zoomToLevel(device, main, 21);
         TestUtils.clickAtCoordinates(device, map, 8.3874964, 47.3884769, true);
+        TestUtils.clickAwayTip(device, main);
         assertTrue(TestUtils.findText(device, false, context.getString(R.string.actionmode_nodeselect)));
         Node node = App.getLogic().getSelectedNode();
         assertNotNull(node);
@@ -183,6 +184,7 @@ public void unjoinMergeNodes() {
         TestUtils.zoomToLevel(device, main, 21);
         TestUtils.unlock(device);
         TestUtils.clickAtCoordinates(device, map, 8.3866386, 47.3904394, true);
+        TestUtils.clickAwayTip(device, main);
         assertTrue(TestUtils.findText(device, false, context.getString(R.string.actionmode_nodeselect)));
         Node node = App.getLogic().getSelectedNode();
         assertNotNull(node);
@@ -220,6 +222,7 @@ public void unjoinMergeNodes() {
     public void append() {
         TestUtils.zoomToLevel(device, main, 21);
         TestUtils.clickAtCoordinates(device, map, 8.3878990, 47.3891959, true);
+        TestUtils.clickAwayTip(device, main);
         assertTrue(TestUtils.findText(device, false, context.getString(R.string.actionmode_nodeselect)));
         Node node = App.getLogic().getSelectedNode();
         assertNotNull(node);
@@ -236,7 +239,9 @@ public void append() {
     @Test
     public void appendWithMenu() {
         TestUtils.zoomToLevel(device, main, 21);
+        TestUtils.clickAwayTip(device, main);
         TestUtils.clickAtCoordinates(device, map, 8.3879569, 47.3893814, true);
+        TestUtils.clickAwayTip(device, main);
         assertTrue(TestUtils.findText(device, false, context.getString(R.string.actionmode_nodeselect)));
         Node node = App.getLogic().getSelectedNode();
         assertNotNull(node);
@@ -256,6 +261,7 @@ public void appendWithMenu() {
     public void rotate() {
         TestUtils.zoomToLevel(device, main, 21);
         TestUtils.clickAtCoordinates(device, map, 8.3881577, 47.3886924, true);
+        TestUtils.clickAwayTip(device, main);
         assertTrue(TestUtils.findText(device, false, context.getString(R.string.actionmode_nodeselect)));
         Node node = App.getLogic().getSelectedNode();
         assertNotNull(node);
diff --git a/src/androidTest/java/de/blau/android/propertyeditor/PropertyEditorTest.java b/src/androidTest/java/de/blau/android/propertyeditor/PropertyEditorTest.java
index ccad7496f..82d3fd514 100644
--- a/src/androidTest/java/de/blau/android/propertyeditor/PropertyEditorTest.java
+++ b/src/androidTest/java/de/blau/android/propertyeditor/PropertyEditorTest.java
@@ -752,6 +752,7 @@ public void checkGroupDialog() {
         assertTrue(found);
         found = TestUtils.clickText(device, true, getTranslatedPresetItemName(main, "Charging Station"), true, false);
         assertTrue(found);
+        TestUtils.clickAwayTip(device, main);
         UiObject2 vehicles = null;
         try {
             vehicles = getField(device, "Types of vehicles which can be charged", 1);