diff --git a/src/stylus/generic/_grid.styl b/src/stylus/generic/_grid.styl
index be00b6839d0..a7bdc54f3bf 100755
--- a/src/stylus/generic/_grid.styl
+++ b/src/stylus/generic/_grid.styl
@@ -12,12 +12,13 @@
   padding-left: $grid-outer-margin
   padding-right: $grid-outer-margin
   
-  &--fluid
-    padding: 0
-  
-  for width in $container-max-widths
+  for size, width in $container-max-widths
     @media only screen and (min-width: width)
       max-width: width
+
+  &--fluid
+    padding: 0
+    max-width: 100%
   
 .row
   display: flex
@@ -48,4 +49,4 @@
             margin-left: (n / $grid-columns * 100)%
             
 .col--spacer, .spacer
-  flex-grow: 1
\ No newline at end of file
+  flex-grow: 1