diff --git a/pkg/lib/form-layout.less b/pkg/lib/form-layout.less
index f70d5628409f..3cb7ea08b25b 100644
--- a/pkg/lib/form-layout.less
+++ b/pkg/lib/form-layout.less
@@ -174,16 +174,6 @@
       }
     }
 
-    // Allow dropdowns to be less wide
-    &:not(.ct-form-layout-relax) > .ct-select,
-    &:not(.ct-form-layout-relax) > .dropdown {
-      width: auto !important;
-    }
-
-    > .form-control {
-      width: auto;
-    }
-
     > .checkbox,
     > .radio {
         // Spacing is handled by grid, not margin
@@ -191,6 +181,22 @@
     }
   }
 
+  > [role=group],
+  > .ct-validation-wrapper > [role=group],
+  > .ct-validation-wrapper > [data-field] {
+    // Allow dropdowns to expand as needed
+    &:not(.ct-form-layout-relax) {
+      > .dropdown {
+        width: auto !important;
+      }
+
+      // <select>s need to be coaxed to be 100%
+      > .ct-select {
+        width: 100%;
+      }
+    }
+  }
+
   // Vertically align checkboxes and radios properly using flex
   .checkbox > label,
   .radio > label,