diff --git a/core/modules/system/templates/html.html.twig b/core/modules/system/templates/html.html.twig
index 50fa76f..62365d4 100644
--- a/core/modules/system/templates/html.html.twig
+++ b/core/modules/system/templates/html.html.twig
@@ -43,7 +43,7 @@
     </a>
     {{ page_top }}
     {{ page }}
-    {{ page_bottom }}
+    <div class="page-container">{{ page_bottom }}</div>
     {{ scripts_bottom }}
   </body>
 </html>
diff --git a/core/modules/views/js/views-contextual.js b/core/modules/views/js/views-contextual.js
index e5eb14b..957d060 100644
--- a/core/modules/views/js/views-contextual.js
+++ b/core/modules/views/js/views-contextual.js
@@ -11,7 +11,7 @@
       var id = $('body').attr('data-views-page-contextual-id');
 
       $('[data-contextual-id="' + id + '"]')
-        .closest(':has(.view)')
+        .closest(':has(.view):not(body)')
         .addClass('contextual-region');
     }
   };
diff --git a/core/themes/classy/templates/layout/html.html.twig b/core/themes/classy/templates/layout/html.html.twig
index 34c8c56..10dc9b6 100644
--- a/core/themes/classy/templates/layout/html.html.twig
+++ b/core/themes/classy/templates/layout/html.html.twig
@@ -48,7 +48,7 @@
       {{ 'Skip to main content'|t }}
     </a>
     {{ page_top }}
-    {{ page }}
+    <div class="page-container">{{ page_bottom }}</div>
     {{ page_bottom }}
     {{ scripts_bottom }}
   </body>