diff --git a/admin/tool/dataprivacy/classes/output/data_requests_table.php b/admin/tool/dataprivacy/classes/output/data_requests_table.php
index 0d7492c1b3c..2b30334c9a4 100644
--- a/admin/tool/dataprivacy/classes/output/data_requests_table.php
+++ b/admin/tool/dataprivacy/classes/output/data_requests_table.php
@@ -288,7 +288,7 @@ class data_requests_table extends table_sql {
         $actionsmenu = new action_menu($actions);
         $actionsmenu->set_menu_trigger(get_string('actions'));
         $actionsmenu->set_owner_selector('request-actions-' . $requestid);
-        $actionsmenu->set_constraint('[data-region=data-requests-table] > .no-overflow');
+        $actionsmenu->set_boundary('window');
 
         return $OUTPUT->render($actionsmenu);
     }
diff --git a/lib/tests/behat/behat_action_menu.php b/lib/tests/behat/behat_action_menu.php
index 6794bd0757f..2e90a3af3fd 100644
--- a/lib/tests/behat/behat_action_menu.php
+++ b/lib/tests/behat/behat_action_menu.php
@@ -52,7 +52,7 @@ class behat_action_menu extends behat_base {
         // Gets the node based on the requested selector type and locator.
         $node = $this->get_node_in_container(
             "css_element",
-            "[role=button][aria-haspopup=true],[role=menuitem][aria-haspopup=true]",
+            "[role=button][aria-haspopup=true],button[aria-haspopup=true],[role=menuitem][aria-haspopup=true]",
             $selectortype,
             $element
         );