diff --git a/app/assets/javascripts/app/views/generic/select.jst.eco b/app/assets/javascripts/app/views/generic/select.jst.eco
index 31efbbd71..173712069 100644
--- a/app/assets/javascripts/app/views/generic/select.jst.eco
+++ b/app/assets/javascripts/app/views/generic/select.jst.eco
@@ -1,4 +1,4 @@
-<div class="controls-select">
+<div class="controls controls--select">
   <select id="<%= @attribute.id %>" class="form-control<%= " #{ @attribute.class }" if @attribute.class %>" name="<%= @attribute.name %>" <%= @attribute.multiple %> <%= @attribute.required %> <%= @attribute.autofocus %>>
 <% if @attribute.options: %>
 <% for row in @attribute.options: %>
diff --git a/app/assets/javascripts/app/views/layout_ref/chat_to_ticket.jst.eco b/app/assets/javascripts/app/views/layout_ref/chat_to_ticket.jst.eco
index 40bf0b8bd..2f9845f4d 100644
--- a/app/assets/javascripts/app/views/layout_ref/chat_to_ticket.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/chat_to_ticket.jst.eco
@@ -99,7 +99,7 @@
     <div class="formGroup-label">
         <label for="Ticket_890825_group_id">Group <span>*</span></label>
     </div>
-    <div class="controls"><div class="controls-select">
+    <div class="controls"><div class="controls controls--select">
         <select id="Ticket_890825_group_id" class="form-control" name="group_id" required="">
             <option value="">-</option>
             <option value="1">Users</option>
@@ -113,7 +113,7 @@
 <div class="formGroup-label">
 <label for="Ticket_890825_owner_id">Owner <span></span></label>
 </div>
-<div class="controls"><div class="controls-select">
+<div class="controls"><div class="controls controls--select">
 <select id="Ticket_890825_owner_id" class="form-control" name="owner_id">
     <option value="" selected="">-</option>
 </select>
@@ -126,7 +126,7 @@
 <div class="formGroup-label">
 <label for="Ticket_890825_state_id">State <span>*</span></label>
 </div>
-<div class="controls"><div class="controls-select">
+<div class="controls"><div class="controls controls--select">
 <select id="Ticket_890825_state_id" class="form-control" name="state_id" required="">
 <option value="">-</option>
 <option value="4">closed</option>
@@ -157,7 +157,7 @@
 <div class="formGroup-label">
 <label for="Ticket_890825_priority_id">Priority <span>*</span></label>
 </div>
-<div class="controls"><div class="controls-select">
+<div class="controls"><div class="controls controls--select">
 <select id="Ticket_890825_priority_id" class="form-control" name="priority_id" required="">
 <option value="">-</option>
 <option value="1">1 low</option>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 7c32c517f..e75015fcd 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -1409,7 +1409,7 @@ fieldset > .form-group {
   margin-bottom: 0;
 }
 
-.controls-select {
+.controls--select {
   position: relative;
 }
 
@@ -4086,7 +4086,7 @@ footer {
     background: none;
   }
 
-  .form-inline .controls-select {
+  .form-inline .controls--select {
     position: static;
   }