diff --git a/reportbuilder/templates/local/dynamictabs/editor.mustache b/reportbuilder/templates/local/dynamictabs/editor.mustache
index 8eac6b65239..6d1011d5479 100644
--- a/reportbuilder/templates/local/dynamictabs/editor.mustache
+++ b/reportbuilder/templates/local/dynamictabs/editor.mustache
@@ -122,7 +122,7 @@
                         {{/filterspresent}}
                     {{/editmode}}
                 </div>
-                <div class="mt-2">
+                <div class="reportbuilder-editor-table-container mt-2">
                     {{! Table }}
                     {{{table}}}
                 </div>
diff --git a/theme/boost/scss/moodle/reportbuilder.scss b/theme/boost/scss/moodle/reportbuilder.scss
index 330816fe92b..2c158146a78 100644
--- a/theme/boost/scss/moodle/reportbuilder.scss
+++ b/theme/boost/scss/moodle/reportbuilder.scss
@@ -92,6 +92,10 @@ $rb-right-sidebar-width: 350px;
     @extend .flex-fill;
     min-width: 0;
 }
+// Allow horizontal scroll in editor table.
+.reportbuilder-editor-table-container {
+    overflow-x: auto;
+}
 
 /* Custom table headers */
 .reportbuilder-table th {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 55e01ffed40..bfc8219c4dd 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -21128,6 +21128,9 @@ div.editor_atto_toolbar button .icon {
 .reportbuilder-report-container {
   min-width: 0; }
 
+.reportbuilder-editor-table-container {
+  overflow-x: auto; }
+
 /* Custom table headers */
 .reportbuilder-table th button[data-action="report-remove-column"] .icon,
 .reportbuilder-table th span[data-drag-type="move"] .icon {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 17878b30f64..a7344417456 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -21074,6 +21074,9 @@ div.editor_atto_toolbar button .icon {
 .reportbuilder-report-container {
   min-width: 0; }
 
+.reportbuilder-editor-table-container {
+  overflow-x: auto; }
+
 /* Custom table headers */
 .reportbuilder-table th button[data-action="report-remove-column"] .icon,
 .reportbuilder-table th span[data-drag-type="move"] .icon {