diff --git a/app/assets/javascripts/app/views/generic/application_selector_row.jst.eco b/app/assets/javascripts/app/views/generic/application_selector_row.jst.eco
index 1494022e032a..4707ee299807 100644
--- a/app/assets/javascripts/app/views/generic/application_selector_row.jst.eco
+++ b/app/assets/javascripts/app/views/generic/application_selector_row.jst.eco
@@ -3,7 +3,7 @@
   <div class="draggable"><%- @Icon('draggable') %></div>
 <% end %>
   <div class="horizontal-filter-body">
-    <div class="controls">
+    <div class="controls horizontal-filter-attribute">
       <div class="u-positionOrigin js-attributeSelector">
         <%- @Icon('arrow-down', 'dropdown-arrow') %>
       </div>
diff --git a/app/assets/javascripts/app/views/generic/ticket_perform_action/row.jst.eco b/app/assets/javascripts/app/views/generic/ticket_perform_action/row.jst.eco
index 0af382197737..3d2d9b4202fb 100644
--- a/app/assets/javascripts/app/views/generic/ticket_perform_action/row.jst.eco
+++ b/app/assets/javascripts/app/views/generic/ticket_perform_action/row.jst.eco
@@ -1,6 +1,6 @@
 <div class="horizontal-filter js-filterElement">
   <div class="horizontal-filter-body">
-    <div class="controls flex-no-shrink">
+    <div class="controls flex-no-shrink horizontal-filter-attribute">
       <div class="u-positionOrigin js-attributeSelector">
         <%- @Icon('arrow-down', 'dropdown-arrow') %>
       </div>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index f8384df08349..d9e42f96c342 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -10781,6 +10781,14 @@ label + .wizard-buttonList {
     border-top: none;
   }
 
+  &-attribute {
+    max-width: 250px;
+
+    .modal--veryLarge & {
+      max-width: 400px;
+    }
+  }
+
   select,
   input {
     border-color: var(--border-alt);