diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index 7eef23a9dd..17b9c84020 100644
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -26,7 +26,10 @@
     }
 
     @if $enable-flex {
-      flex: 1;
+      flex: 1 1 auto;
+      // Add width 1% and flex-basis auto to ensure that button will not wrap out
+      // the column. Applies to IE Edge+ and Firefox. Chrome do not require this.
+      width: 1%;
     } @else {
       // IE9 fubars the placeholder attribute in text inputs and the arrows on
       // select elements in input groups. To fix it, we float the input. Details: