diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index 26e041ab32c8..facecd37ae0a 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -36,6 +36,7 @@
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
   display: flex;
+  flex-wrap: wrap;
   justify-content: flex-start;
 
   .input-group {