diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index 93a3a8707f..dcdec80000 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -22,7 +22,7 @@
 
       @for $i from 1 through $columns {
         .col-#{$breakpoint}-#{$i} {
-          @include make-col($i, $columns);
+          @include make-col($i, $columns, $gutter);
         }
       }
 
diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 6e67f92cd3..3ba4f43bc7 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -33,11 +33,11 @@
   margin-right: ($gutter / -2);
 }
 
-@mixin make-col($size, $columns: $grid-columns) {
+@mixin make-col($size, $columns: $grid-columns, $gutter: $grid-gutter-width) {
   position: relative;
   min-height: 1px;
-  padding-right: ($grid-gutter-width / 2);
-  padding-left:  ($grid-gutter-width / 2);
+  padding-right: ($gutter / 2);
+  padding-left:  ($gutter / 2);
 
   @if $enable-flex {
     flex: 0 0 percentage($size / $columns);