diff --git a/scss/mixins/_grid.scss b/scss/mixins/_grid.scss
index 94b8295835..e48e3db5db 100644
--- a/scss/mixins/_grid.scss
+++ b/scss/mixins/_grid.scss
@@ -46,6 +46,7 @@
 @mixin make-col-span($size, $columns: $grid-columns) {
   @if $enable-flex {
     flex: 0 0 percentage($size / $columns);
+    max-width: percentage($size / $columns);
   } @else {
     width: percentage($size / $columns);
   }