diff --git a/htdocs/testing/frameworks/behat/classes/BehatGeneral.php b/htdocs/testing/frameworks/behat/classes/BehatGeneral.php
index a867c84e8b180ea666ad6af82f697f181bd389f0..8af2ae3cc9ef2af29325931fa2ff499b97f83278 100644
--- a/htdocs/testing/frameworks/behat/classes/BehatGeneral.php
+++ b/htdocs/testing/frameworks/behat/classes/BehatGeneral.php
@@ -1524,6 +1524,7 @@ EOF;
  *
  */
     public function i_delete_link_resource_menu_item($item) {
+        $this->getSession()->wait(2000, '(jQuery("div#menuitemlist tr:contains(\'' . $item . '\') button:contains(\'Delete\')")[0].length > 0)');
         $this->getSession()->executeScript('jQuery("div#menuitemlist tr:contains(\'' . $item . '\') button:contains(\'Delete\')")[0].click();');
         usleep(10000);
         $this->i_accept_confirm_popup();
diff --git a/htdocs/testing/frameworks/behat/classes/BehatNavigation.php b/htdocs/testing/frameworks/behat/classes/BehatNavigation.php
index 32ac7da55a3bc0262a807ffaff176c6dfea13a39..fc45e2481dc44774815e5772c2fe3bbdddb13a9e 100644
--- a/htdocs/testing/frameworks/behat/classes/BehatNavigation.php
+++ b/htdocs/testing/frameworks/behat/classes/BehatNavigation.php
@@ -192,8 +192,11 @@ class BehatNavigation extends BehatBase {
             // We just want to expand the parent node as this doesn't align top left to the outer-link a link.
             $node = $node->getParent();
         }
-
         $node->click();
+        if ($node->getParent()->hasAttribute('id')) {
+            $id = $node->getParent()->getAttribute('id');
+            $this->getSession()->wait(2000, "($('#" . $id . "_target.show').length > 0)");
+        }
     }
 
     /**
diff --git a/htdocs/theme/raw/templates/admin/site/menu.tpl b/htdocs/theme/raw/templates/admin/site/menu.tpl
index f33283f529fba79610de27958376a882edce48bf..5ab47a750cb988c4ff12509bd5c20b002a798fe4 100644
--- a/htdocs/theme/raw/templates/admin/site/menu.tpl
+++ b/htdocs/theme/raw/templates/admin/site/menu.tpl
@@ -6,7 +6,7 @@
             <div class="card-body">
                 <p class="lead">{str tag=linksandresourcesmenupagedescription section=admin args=$descriptionstrargs}</p>
                 <div class="dropdown form-group">
-                    <label for="menuselect">{str tag=edit}:</label>
+                    <label for="menuselect">{str tag=edit}</label>
                     <span class="picker">
                         <select class="form-control select" id="menuselect" name="menuselect">
                         {foreach from=$MENUS item=menu}
diff --git a/test/behat/features/settings/create_and_delete_menu_item.feature b/test/behat/features/settings/create_and_delete_menu_item.feature
index 68acb2746ce45f6caf709d6ddf7b2add5b3e1c2e..c2f96f8dbcf0e81639cc06679cad073ede42fa52 100644
--- a/test/behat/features/settings/create_and_delete_menu_item.feature
+++ b/test/behat/features/settings/create_and_delete_menu_item.feature
@@ -9,7 +9,7 @@ Scenario: Creating and deleting external links (Selenium 1426983)
     Given I log in as "admin" with password "Kupuh1pa!"
     # Entering an external link
     And I choose "Menus" in "Configure site" from administration menu
-    And I select "Logged-in links and resources" from "Edit:"
+    And I select "Logged-in links and resources" from "Edit"
     And I fill in "namenew" with "Test Menu Link"
     And I fill in "linkedtonew" with "https://mahara.org/"
     And I press "Add"
@@ -20,7 +20,7 @@ Scenario: Creating and deleting external links (Selenium 1426983)
     And I choose "Dashboard" from main menu
     Then I should see "Test Menu Link"
     And I choose "Menus" in "Configure site" from administration menu
-    And I select "Logged-in links and resources" from "Edit:"
+    And I select "Logged-in links and resources" from "Edit"
     And I delete the link and resource menu item "Test Menu Link"
     And I should see "Item deleted"
     And I press "Save changes"
@@ -38,7 +38,7 @@ Scenario: Make sure blogs do not show in site file link options (Bug #1537426)
     And I attach the file "Image1.jpg" to "File"
     # Entering an external link
     And I choose "Menus" in "Configure site" from administration menu
-    And I select "Logged-in links and resources" from "Edit:"
+    And I select "Logged-in links and resources" from "Edit"
     And I set the following fields to these values:
     | Site file | 1 |
     And the "linkedtonew" select box should not contain "Site blog"