diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
index 7dabc375161..d49b451fe52 100644
--- a/grade/edit/tree/lib.php
+++ b/grade/edit/tree/lib.php
@@ -129,6 +129,7 @@ class grade_edit_tree {
         $actionsmenu = new action_menu();
         $actionsmenu->set_menu_trigger(get_string('edit'));
         $actionsmenu->set_owner_selector('grade-item-' . $eid);
+        $actionsmenu->set_boundary('window');
 
         if (!$is_category_item && ($icon = $this->gtree->get_edit_icon($element, $this->gpr, true))) {
             $actionsmenu->add($icon);
diff --git a/grade/templates/edit_tree.mustache b/grade/templates/edit_tree.mustache
index e9317ce42de..16b5b8aecbe 100644
--- a/grade/templates/edit_tree.mustache
+++ b/grade/templates/edit_tree.mustache
@@ -43,7 +43,7 @@
 }}
 
 <form id="gradetreeform" method="post" action="{{actionurl}}">
-    <div>
+    <div class="position-relative">
         <input type="hidden" name="sesskey" value="{{sesskey}}">
         {{#notification}}
             {{>core/notification_info}}