diff --git a/scss/components/_grid.scss b/scss/components/_grid.scss
index 40e37b2d..e31c219b 100644
--- a/scss/components/_grid.scss
+++ b/scss/components/_grid.scss
@@ -381,6 +381,16 @@ $block-grid-max-size: 6 !default;
         &.panel { @include grid-panel-reset; }
       }
     }
+    .#{$size}-collapse {
+      @include breakpoint($size) {
+        &.grid-content { padding: 0; }
+      }
+    }
+    .#{$size}-uncollapse {
+      @include breakpoint($size) {
+        &.grid-content { padding: 0 $block-padding; }
+      }
+    }
   }
 
   /*