diff --git a/admin/tool/admin_presets/tests/behat/delete.feature b/admin/tool/admin_presets/tests/behat/delete.feature
index c6d6b821d81..39d169639cb 100644
--- a/admin/tool/admin_presets/tests/behat/delete.feature
+++ b/admin/tool/admin_presets/tests/behat/delete.feature
@@ -14,8 +14,10 @@ Feature: Admin preset deletion
     And I should see "Custom preset"
     When I open the action menu in "Custom preset" "table_row"
     And I should see "Delete"
+    And I press the escape key
     And I open the action menu in "Full" "table_row"
     Then I should not see "Delete"
+    And I press the escape key
     And I open the action menu in "Starter" "table_row"
     And I should not see "Delete"
 
diff --git a/lib/templates/action_menu_trigger.mustache b/lib/templates/action_menu_trigger.mustache
index 0c3b07f98e9..6f2faa3d09e 100644
--- a/lib/templates/action_menu_trigger.mustache
+++ b/lib/templates/action_menu_trigger.mustache
@@ -79,7 +79,7 @@
     }
 }}
 <div class="dropdown{{^secondary.items}} hidden{{/secondary.items}}">
-    <a href="#" tabindex="0" class="{{triggerextraclasses}} dropdown-toggle icon-no-margin" id="action-menu-toggle-{{instance}}" aria-label="{{title}}" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="action-menu-{{instance}}-menu" data-display="static">
+    <a href="#" tabindex="0" class="{{triggerextraclasses}} dropdown-toggle icon-no-margin" id="action-menu-toggle-{{instance}}" aria-label="{{title}}" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" aria-controls="action-menu-{{instance}}-menu">
         {{{actiontext}}}
         {{{menutrigger}}}
             {{#icon}}
diff --git a/reportbuilder/classes/table/base_report_table.php b/reportbuilder/classes/table/base_report_table.php
index 28c94c88be9..5f72f61bc44 100644
--- a/reportbuilder/classes/table/base_report_table.php
+++ b/reportbuilder/classes/table/base_report_table.php
@@ -262,7 +262,7 @@ abstract class base_report_table extends table_sql implements dynamic, renderabl
 
         $this->wrap_html_start();
 
-        echo html_writer::start_tag('div', ['class' => 'no-overflow']);
+        echo html_writer::start_tag('div');
         echo html_writer::start_tag('table', $this->attributes);
     }
 }