diff --git a/mod/forum/templates/local/grades/local/grader/grading.mustache b/mod/forum/templates/local/grades/local/grader/grading.mustache
index a6a438619cd..706c74adbfb 100644
--- a/mod/forum/templates/local/grades/local/grader/grading.mustache
+++ b/mod/forum/templates/local/grades/local/grader/grading.mustache
@@ -33,6 +33,7 @@
     }
 }}
 {{<core/drawer}}
+    {{$drawerid}}grading-drawer-{{uniqid}}{{/drawerid}}
     {{$drawerclasses}}grader-grading-panel flex-shrink-0{{/drawerclasses}}
     {{$drawercontent}}
         <div class="h-100 w-100 bg-white d-flex flex-column">
@@ -76,7 +77,7 @@
                         <button
                             class="btn btn-icon icon-size-3 icon-no-margin colour-inherit"
                             data-action="collapse-grading-drawer"
-                            aria-controls="grading-drawer"
+                            aria-controls="grading-drawer-{{uniqid}}"
                             aria-expanded="true"
                             title="{{#str}} closebuttontitle, core {{/str}}"
                         >
diff --git a/mod/forum/templates/local/grades/local/grader/navigation.mustache b/mod/forum/templates/local/grades/local/grader/navigation.mustache
index 8313ee759c2..6008663c3ed 100644
--- a/mod/forum/templates/local/grades/local/grader/navigation.mustache
+++ b/mod/forum/templates/local/grades/local/grader/navigation.mustache
@@ -51,7 +51,7 @@
         <button
             class="btn btn-icon icon-no-margin drawer-button mr-1 active"
             data-action="expand-grading-drawer"
-            aria-controls="grading-drawer"
+            aria-controls="grading-drawer-{{uniqid}}"
             aria-expanded="true"
             type="button"
             title="{{#str}} showgraderpanel, mod_forum {{/str}}"
@@ -63,7 +63,7 @@
             class="btn btn-icon icon-no-margin drawer-button mr-1"
             aria-label="Open or close grader panel"
             data-action="collapse-grading-drawer"
-            aria-controls="grading-drawer"
+            aria-controls="grading-drawer-{{uniqid}}"
             aria-expanded="true"
             type="button"
             title="{{#str}} hidegraderpanel, mod_forum {{/str}}"