diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss
index af49c10a3a3..a83711e287c 100644
--- a/theme/boost/scss/moodle/grade.scss
+++ b/theme/boost/scss/moodle/grade.scss
@@ -35,10 +35,14 @@
     #region-main {
         min-width: 100%;
         width: auto;
+        display: inline-flex;
         & > .card {
             width: auto;
             overflow-x: initial;
         }
+        div[role="main"] {
+            flex: 1 1 auto;
+        }
     }
     [data-region="blocks-column"] {
         width: 100%;
@@ -384,12 +388,6 @@
             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 c248b134b49..7791d6dc8a6 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -16177,10 +16177,13 @@ p.arrow_button {
 
 .path-grade-report-grader #region-main {
   min-width: 100%;
-  width: auto; }
+  width: auto;
+  display: inline-flex; }
   .path-grade-report-grader #region-main > .card, .path-grade-report-grader #page-enrol-users #region-main > #filterform, #page-enrol-users .path-grade-report-grader #region-main > #filterform, .path-grade-report-grader .que #region-main > .history, .que .path-grade-report-grader #region-main > .history, .path-grade-report-grader .userprofile .profile_tree #region-main > section, .userprofile .profile_tree .path-grade-report-grader #region-main > section, .path-grade-report-grader #region-main > .groupinfobox, .path-grade-report-grader #region-main > .well {
     width: auto;
     overflow-x: initial; }
+  .path-grade-report-grader #region-main div[role="main"] {
+    flex: 1 1 auto; }
 
 .path-grade-report-grader [data-region="blocks-column"] {
   width: 100%;
@@ -16394,12 +16397,6 @@ p.arrow_button {
 .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.
  */