diff --git a/src/css/imports/layout.scss b/src/css/imports/layout.scss
index 00c263c..8926711 100644
--- a/src/css/imports/layout.scss
+++ b/src/css/imports/layout.scss
@@ -1,5 +1,7 @@
 .l-wrapper {
-  width: 100%;
+  outline: 1px dotted #000;
+
+  width: calc(100vw - #{$unit-size});
   max-width: $wrapper-max-width;
   margin-left: auto;
   margin-right: auto;
@@ -36,6 +38,7 @@
   }
 
   @media (min-width: $wrapper-max-width--wide) {
+    width: 100%;
     padding-left: $padding-horizontal-s;
     padding-right: $padding-horizontal-s;
   }
@@ -83,7 +86,7 @@
   padding-top: 0.5 * $unit-size;
   padding-bottom: 0.5 * $unit-size;
   width: 100%;
-  max-width: 100%;
+  max-width: calc(100% - #{$unit-size});
 
   @media (min-width: $bp-s) {
     padding-top: $unit-size;
@@ -110,6 +113,7 @@
 
   &.is-full-width {
     width: 100%;
+    max-width: initial;
   }
 
   &.no-margin,