diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index d8b78ff58..f3a3e8ba4 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -10472,6 +10472,12 @@ body.slim-container .form-buttons {
     clear: none;
   }
 }
+.form-group .select2-container {
+  width: 100%!important;
+}
+.select2-dropdown {
+  z-index: 10000;
+}
 [data-control=toolbar] .form-control {
   display: inline-block;
   margin-right: 15px;
@@ -10500,10 +10506,13 @@ body.slim-container .form-buttons {
   display: inline-block;
   width: auto;
   height: 36px;
+  margin-right: 15px;
 }
-[data-control=toolbar] .select2-container .select2-selection {
-  height: 34px;
-  line-height: 34px;
+[data-control=toolbar] .select2-container .select2-selection__rendered {
+  line-height: 17px;
+}
+[data-control=toolbar] .select2-container .select2-selection--single {
+  height: 36px;
 }
 [data-control=toolbar] select.form-control.custom-select {
   display: none;
diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less
index f35219722..98afe13b7 100644
--- a/modules/system/assets/ui/less/form.less
+++ b/modules/system/assets/ui/less/form.less
@@ -369,6 +369,18 @@ body.slim-container {
     }
 }
 
+//
+// Select2 
+//
+
+.form-group .select2-container {
+    width: 100%!important;
+}
+
+.select2-dropdown {
+    z-index: 10000; 
+}
+
 //
 // Controls inside toolbar
 //
@@ -408,10 +420,14 @@ body.slim-container {
         display: inline-block;
         width: auto;
         height: 36px;
+        margin-right: 15px;
 
-        .select2-selection {
-            height: 34px;
-            line-height: 34px;
+        .select2-selection__rendered {
+            line-height: 17px;
+        }
+
+        .select2-selection--single {
+            height: 36px;
         }
     }