diff --git a/scss/components/form/_form.scss b/scss/components/form/_form.scss
index 2ad327031..eb8f4758a 100644
--- a/scss/components/form/_form.scss
+++ b/scss/components/form/_form.scss
@@ -301,7 +301,6 @@
     > .#{$ns}Form-control {
       flex-basis: 0;
       flex-grow: 1;
-      min-width: unset;
     }
   }
 }
diff --git a/scss/components/form/_select.scss b/scss/components/form/_select.scss
index ddb3de350..e4a63166a 100644
--- a/scss/components/form/_select.scss
+++ b/scss/components/form/_select.scss
@@ -44,6 +44,7 @@
     color: $Form-select-placeholderColor;
     line-height: $Form-input-lineHeight;
     user-select: none;
+    white-space: nowrap;
   }
 
   &-value {