diff --git a/mod/data/edit.php b/mod/data/edit.php
index c6adcfe73fa..7439ab1aeb0 100644
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -121,6 +121,7 @@ if ($rid) {
     $PAGE->navbar->add(get_string('editentry', 'data'));
 }
 
+$PAGE->add_body_class('mediumwidth');
 $PAGE->set_title($data->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->force_settings_menu(true);
diff --git a/mod/data/export.php b/mod/data/export.php
index 449b8468135..e7f043ea1fc 100644
--- a/mod/data/export.php
+++ b/mod/data/export.php
@@ -112,6 +112,7 @@ if ($mform->is_cancelled()) {
 }
 
 // Build header to match the rest of the UI.
+$PAGE->add_body_class('mediumwidth');
 $PAGE->set_title($data->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->force_settings_menu(true);
diff --git a/mod/data/field.php b/mod/data/field.php
index 156c753d7a2..7666e2cdd70 100644
--- a/mod/data/field.php
+++ b/mod/data/field.php
@@ -107,6 +107,7 @@ $formimportzip->set_data(array('d' => $data->id));
 
 $actionbar = new \mod_data\output\action_bar($data->id, $PAGE->url);
 
+$PAGE->add_body_class('mediumwidth');
 $PAGE->set_title(get_string('course') . ': ' . $course->fullname);
 $PAGE->set_heading($course->fullname);
 $PAGE->activityheader->disable();
diff --git a/mod/data/import.php b/mod/data/import.php
index 4f651dde8e2..19fd9f5b5e1 100644
--- a/mod/data/import.php
+++ b/mod/data/import.php
@@ -77,6 +77,7 @@ if ($form->is_cancelled()) {
 
 /// Print the page header
 $PAGE->navbar->add(get_string('add', 'data'));
+$PAGE->add_body_class('mediumwidth');
 $PAGE->set_title($data->name);
 $PAGE->set_heading($course->fullname);
 $PAGE->set_secondary_active_tab('modulepage');
diff --git a/mod/data/preset.php b/mod/data/preset.php
index 8cc1de89130..a0470897fa9 100644
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -70,6 +70,7 @@ require_capability('mod/data:managetemplates', $context);
 
 $url = new moodle_url('/mod/data/preset.php', array('d' => $data->id));
 
+$PAGE->add_body_class('mediumwidth');
 $PAGE->set_url($url);
 $PAGE->set_title(get_string('course') . ': ' . $course->fullname);
 $PAGE->set_heading($course->fullname);
diff --git a/mod/data/templates.php b/mod/data/templates.php
index e22faab327c..43010bd38ba 100644
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -74,7 +74,7 @@ $PAGE->set_heading($course->fullname);
 $PAGE->set_pagelayout('admin');
 $PAGE->force_settings_menu(true);
 $PAGE->activityheader->disable();
-$PAGE->add_body_class('limitedwidth');
+$PAGE->add_body_class('mediumwidth');
 
 echo $OUTPUT->header();
 
diff --git a/mod/data/view.php b/mod/data/view.php
index 88ef0fd6e90..702e01fdcc6 100644
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -225,6 +225,7 @@ if ($mode == 'asearch') {
     $PAGE->navbar->add(get_string('search'));
 }
 
+$PAGE->add_body_class('mediumwidth');
 $PAGE->set_title($title);
 $PAGE->set_heading($course->fullname);
 $PAGE->force_settings_menu(true);
diff --git a/theme/boost/scss/moodle/layout.scss b/theme/boost/scss/moodle/layout.scss
index 153050c0244..c54911d9684 100644
--- a/theme/boost/scss/moodle/layout.scss
+++ b/theme/boost/scss/moodle/layout.scss
@@ -68,6 +68,19 @@
             }
         }
     }
+    body.mediumwidth {
+        #page.drawers {
+            .main-inner {
+                max-width: $medium-content-maxwidth;
+            }
+            .footer-popover {
+                max-width: $medium-content-maxwidth;
+                width: 100%;
+                margin: 0 auto;
+                @include border-radius();
+            }
+        }
+    }
     .header-maxwidth {
         max-width: $course-content-maxwidth;
         margin: 0 auto;
diff --git a/theme/boost/scss/moodle/variables.scss b/theme/boost/scss/moodle/variables.scss
index 241cd892170..81a33cb572e 100644
--- a/theme/boost/scss/moodle/variables.scss
+++ b/theme/boost/scss/moodle/variables.scss
@@ -24,6 +24,7 @@ $primary-nav-padding-x: ($spacer / 2) !default;
 
 $navbar-height: 60px !default;
 $course-content-maxwidth: 830px !default;
+$medium-content-maxwidth: 1120px !default;
 $h5p-content-maxwidth: 960px !default;
 
 $box-shadow-drawer-left: -0.25rem .25rem .8rem rgba($black, .025) !default;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 7120d1ba330..b8beb9ba539 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -20539,6 +20539,13 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
     width: 100%;
     margin: 0 auto;
     border-radius: 0.5rem; }
+  body.mediumwidth #page.drawers .main-inner {
+    max-width: 1120px; }
+  body.mediumwidth #page.drawers .footer-popover {
+    max-width: 1120px;
+    width: 100%;
+    margin: 0 auto;
+    border-radius: 0.5rem; }
   .header-maxwidth {
     max-width: 830px;
     margin: 0 auto;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 85667cd7740..80d3c3a232c 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -20485,6 +20485,13 @@ span[data-flexitour="container"][x-placement="right"], span[data-flexitour="cont
     width: 100%;
     margin: 0 auto;
     border-radius: 0.25rem; }
+  body.mediumwidth #page.drawers .main-inner {
+    max-width: 1120px; }
+  body.mediumwidth #page.drawers .footer-popover {
+    max-width: 1120px;
+    width: 100%;
+    margin: 0 auto;
+    border-radius: 0.25rem; }
   .header-maxwidth {
     max-width: 830px;
     margin: 0 auto;