diff --git a/modules/system/assets/ui/js/select.js b/modules/system/assets/ui/js/select.js
index ae2df9e24..dc655fbe1 100644
--- a/modules/system/assets/ui/js/select.js
+++ b/modules/system/assets/ui/js/select.js
@@ -37,7 +37,8 @@
         var selectOptions = {
             templateResult: formatSelectOption,
             templateSelection: formatSelectOption,
-            escapeMarkup: function(m) { return m }
+            escapeMarkup: function(m) { return m },
+            width: 'style'
         }
 
         /*
diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less
index 691b4f0dc..9a0626261 100644
--- a/modules/system/assets/ui/less/form.less
+++ b/modules/system/assets/ui/less/form.less
@@ -370,19 +370,15 @@ body.slim-container {
 }
 
 //
-// Select2 
+// Select2
 //
 
-.form-group .select2-container {
-    width: 100%!important;
-}
-
 .select2-container--default .select2-selection--single .select2-selection__arrow b {
     border: none;
 }
 
 .select2-dropdown {
-    z-index: 10000; 
+    z-index: 10000;
 }
 
 //