diff --git a/grade/lib.php b/grade/lib.php
index f4d1cfb9f43..8f268a0d826 100644
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -2663,6 +2663,10 @@ class grade_structure {
             $context->divider2 = false;
         }
 
+        if ($mode == 'setup') {
+            $context->databoundary = 'window';
+        }
+
         if (!empty($USER->editing) || isset($context->gradeanalysisurl) || isset($context->gradesonlyurl)
                 || isset($context->aggregatesonlyurl) || isset($context->fullmodeurl) || isset($context->reporturl0)
                 || isset($context->ascendingfirstnameurl) || isset($context->ascendingurl)
diff --git a/grade/templates/category_settings.mustache b/grade/templates/category_settings.mustache
index ceca527f62a..5387a95a19d 100644
--- a/grade/templates/category_settings.mustache
+++ b/grade/templates/category_settings.mustache
@@ -15,7 +15,7 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    @template core_grades/cellmenu
+    @template core_grades/category_settings
 
     This template renders action menu for a given cell.
     Example context (json):
diff --git a/grade/templates/cellmenu.mustache b/grade/templates/cellmenu.mustache
index 2342db06f23..f90e516af33 100644
--- a/grade/templates/cellmenu.mustache
+++ b/grade/templates/cellmenu.mustache
@@ -42,6 +42,7 @@
     <div class="dropdown">
         <button class="btn btn-link btn-icon icon-size-3 cellmenubtn"
             type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                {{#databoundary}}data-boundary="{{databoundary}}"{{/databoundary}}
                 {{#datatype}}data-type="{{datatype}}"{{/datatype}}
                 {{#dataid}}data-id="{{dataid}}"{{/dataid}}>
             <i class="icon fa fa-ellipsis-h fa-fw m-0" title="{{#str}} cellactions, gradereport_grader {{/str}}" aria-hidden="true"></i>
diff --git a/grade/templates/edit_tree.mustache b/grade/templates/edit_tree.mustache
index e7f3f8cd790..18f486d59aa 100644
--- a/grade/templates/edit_tree.mustache
+++ b/grade/templates/edit_tree.mustache
@@ -42,7 +42,7 @@
 {{/notification}}
 <div class="gradetree-wrapper d-none">
     <form id="gradetreeform" method="post" action="{{actionurl}}" >
-        <div>
+        <div class="position-relative">
             <input type="hidden" name="sesskey" value="{{sesskey}}">
             {{{table}}}
             {{{stickyfooter}}}