diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module
index 2f7f77a9730dc1937058858c672c41a179279371..0162b583b637be1d9d9176ad19a7638b65b2abcd 100644
--- a/modules/overlay/overlay.module
+++ b/modules/overlay/overlay.module
@@ -261,6 +261,18 @@ function overlay_preprocess_html(&$variables) {
   }
 }
 
+/**
+ * Preprocess template variables for maintenance-page.tpl.php.
+ *
+ * If the current page request is inside the overlay, add appropriate classes
+ * to the <body> element, and simplify the page title.
+ *
+ * @see overlay_preprocess_maintenance_page()
+ */
+function overlay_preprocess_maintenance_page(&$variables) {
+  overlay_preprocess_html($variables);
+}
+
 /**
  * Preprocess template variables for page.tpl.php.
  *
diff --git a/themes/seven/style.css b/themes/seven/style.css
index 148adbcdd87d7d6850e994fa3784bad9538b2ecf..df0e6fddc11d2b042edf9fc9b9db7e16f17b1859 100644
--- a/themes/seven/style.css
+++ b/themes/seven/style.css
@@ -931,6 +931,7 @@ body.in-maintenance #content {
   padding-right: 20px;
 }
 body.in-maintenance #page {
+  overflow: auto;
   width: 770px;
   margin: 0 auto;
   padding-top: 2em;