diff --git a/CHANGES.md b/CHANGES.md
index 1a9782f792d..4b62dd65fd6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased
 
+* 2024-05-11 - Improvement: Smart menu "locations" must be filled with a value, resolves #404
 * 2024-05-09 - Bugfix: Smart menu menubar overlaid course index, resolves #607
 * 2024-04-27 - Improvement: Add navigation to policy overview page, resolves #633
 
diff --git a/tests/behat/theme_boost_union_smartmenusettings_menus_management.feature b/tests/behat/theme_boost_union_smartmenusettings_menus_management.feature
index a93f52c660f..c513d5b109d 100644
--- a/tests/behat/theme_boost_union_smartmenusettings_menus_management.feature
+++ b/tests/behat/theme_boost_union_smartmenusettings_menus_management.feature
@@ -136,17 +136,17 @@ Feature: Configuring the theme_boost_union plugin on the "Smart menus" page, man
     And "Enrolled courses" "table_row" should appear before "Completed courses" "table_row"
 
   @javascript
-  Scenario: Smartmenus: Menus: Management - Make location field required
+  Scenario: Smartmenus: Menus: Management - Make sure that location field is filled
     When I log in as "admin"
     And I navigate to smart menus
     And I click on "Create menu" "button"
     And I set the following fields to these values:
       | Title            | Links     |
     And I click on "Save and return" "button"
-    And I should see "Required" in the "#fitem_id_location" "css_element"
-    Then I set the field "Menu location(s)" to "Main"
+    Then I should see "Required" in the "#fitem_id_location" "css_element"
+    And I set the field "Menu location(s)" to "Main"
     And I click on "Save and return" "button"
-    And I should see "Links" in the "smartmenus" "table"
+    Then I should see "Links" in the "smartmenus" "table"
     And I set "Links" smart menu items with the following fields to these values:
       | Title          | Info    |
       | Menu item type | Heading |