diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss
index 5d92a34c2f0..af49c10a3a3 100644
--- a/theme/boost/scss/moodle/grade.scss
+++ b/theme/boost/scss/moodle/grade.scss
@@ -359,7 +359,7 @@
 /**
  * Grader report.
  */
-.path-grade-report {
+.path-grade-report-grader {
     .gradeparent {
         table {
             @include border-radius($border-radius);
@@ -384,6 +384,12 @@
             cursor: pointer;
         }
     }
+    #page-header.row {
+        flex: 1 0 auto;
+    }
+    #page-wrapper #page {
+        flex-flow: wrap;
+    }
 }
 
 /**
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 6e2f5dbdbba..fac82ca8767 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -16357,21 +16357,27 @@ p.arrow_button {
 /**
  * Grader report.
  */
-.path-grade-report .gradeparent tr .cell {
+.path-grade-report-grader .gradeparent tr .cell {
   background-color: #fff; }
 
-.path-grade-report .gradeparent table,
-.path-grade-report .gradeparent .cell {
+.path-grade-report-grader .gradeparent table,
+.path-grade-report-grader .gradeparent .cell {
   border-color: #dee2e6; }
 
-.path-grade-report .gradeparent tr:nth-of-type(even) .cell,
-.path-grade-report .gradeparent .floater .cell,
-.path-grade-report .gradeparent .avg {
+.path-grade-report-grader .gradeparent tr:nth-of-type(even) .cell,
+.path-grade-report-grader .gradeparent .floater .cell,
+.path-grade-report-grader .gradeparent .avg {
   background-color: #f8f9fa; }
 
-.path-grade-report .gradeparent table .clickable {
+.path-grade-report-grader .gradeparent table .clickable {
   cursor: pointer; }
 
+.path-grade-report-grader #page-header.row {
+  flex: 1 0 auto; }
+
+.path-grade-report-grader #page-wrapper #page {
+  flex-flow: wrap; }
+
 /**
  * User report.
  */
diff --git a/theme/bootstrapbase/less/moodle/grade.less b/theme/bootstrapbase/less/moodle/grade.less
index bb80f7afcd5..911a1552409 100644
--- a/theme/bootstrapbase/less/moodle/grade.less
+++ b/theme/bootstrapbase/less/moodle/grade.less
@@ -297,7 +297,7 @@
 /**
  * Grader report.
  */
-.path-grade-report {
+.path-grade-report-grader {
     .gradeparent {
         table {
             .border-radius(@baseBorderRadius);
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 9aaf92b58d7..243577276cb 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -19175,24 +19175,24 @@ button.yui3-button.closebutton:hover {
 /**
  * Grader report.
  */
-.path-grade-report .gradeparent table {
+.path-grade-report-grader .gradeparent table {
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.path-grade-report .gradeparent tr .cell {
+.path-grade-report-grader .gradeparent tr .cell {
   background-color: #fff;
 }
-.path-grade-report .gradeparent table,
-.path-grade-report .gradeparent .cell {
+.path-grade-report-grader .gradeparent table,
+.path-grade-report-grader .gradeparent .cell {
   border-color: #ddd;
 }
-.path-grade-report .gradeparent tr:nth-of-type(even) .cell,
-.path-grade-report .gradeparent .floater .cell,
-.path-grade-report .gradeparent .avg {
+.path-grade-report-grader .gradeparent tr:nth-of-type(even) .cell,
+.path-grade-report-grader .gradeparent .floater .cell,
+.path-grade-report-grader .gradeparent .avg {
   background-color: #f9f9f9;
 }
-.path-grade-report .gradeparent table .clickable {
+.path-grade-report-grader .gradeparent table .clickable {
   cursor: pointer;
 }
 /**