diff --git a/scss/mixins/_grid-framework.scss b/scss/mixins/_grid-framework.scss
index ad2060cbf6ee320ffbee64249972329ec4ed0f39..aa5f4924ae7c2b716498cf39e67e7a7b626a9d41 100644
--- a/scss/mixins/_grid-framework.scss
+++ b/scss/mixins/_grid-framework.scss
@@ -22,15 +22,13 @@
     @include media-breakpoint-up($breakpoint) {
       // Work around cross-media @extend (https://github.com/sass/sass/issues/1050)
       %grid-column-float-#{$breakpoint} {
-        @if $enable-flex {
-          // Do nothing
-        } @else {
-          float: left;
-        }
+        float: left;
       }
       @for $i from 1 through $columns {
         .col-#{$breakpoint}-#{$i} {
-          @extend %grid-column-float-#{$breakpoint};
+          @if not $enable-flex {
+            @extend %grid-column-float-#{$breakpoint};
+          }
           @include make-col-span($i, $columns);
         }
       }