diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less
index ae699243e..23e220425 100644
--- a/public/css/icinga/forms.less
+++ b/public/css/icinga/forms.less
@@ -95,7 +95,6 @@ form:not(.inline):not([role="search"]) {
 
 .spinner {
   line-height: 2.5em;
-  margin: .5em 0;
 
   &:before {
     margin-left: .5em;
@@ -118,6 +117,16 @@ select ~ .spinner:before {
 .control-group select {
   background: @low-sat-blue;
   flex: 1;
+  width: 0;
+}
+
+.control-group select option * {
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  max-width: 100%;
+  -ms-text-overflow: ellipsis;
+  text-overflow: ellipsis;
 }
 
 .control-group input:not([type="checkbox"]),
@@ -203,6 +212,10 @@ input.search {
   opacity: 0
 }
 
+.control-group .spinner {
+  margin: .5em 0;
+}
+
 .form-controls {
   .spinner {
     order: -1;