diff --git a/app/helpers/filters_helper.rb b/app/helpers/filters_helper.rb
index e06636224..0b04f6f44 100644
--- a/app/helpers/filters_helper.rb
+++ b/app/helpers/filters_helper.rb
@@ -28,9 +28,9 @@ module FiltersHelper
 
   def filter_dialog(label, &block)
     tag.dialog class: "margin-block-start-half popup panel flex-column align-start gap-half fill-white shadow txt-small", data: {
-      action: "turbo:before-cache@document->dialog#close keydown->navigable-list#navigate filter:changed->navigable-list#reset toggle->filter#filter dialog:close@document->filter#clearInput",
+      action: "turbo:before-cache@document->dialog#close keydown->navigable-list#navigate filter:changed->navigable-list#reset toggle->filter#filter",
       aria: { label: label, aria_description: label },
-      controller: "filter navigable-list",
+      controller: "navigable-list",
       dialog_target: "dialog",
       navigable_list_focus_on_selection_value: false,
       navigable_list_actionable_items_value: true
diff --git a/app/views/events/index/_filter.html.erb b/app/views/events/index/_filter.html.erb
index 37dab9e2b..0fdc6bfb8 100644
--- a/app/views/events/index/_filter.html.erb
+++ b/app/views/events/index/_filter.html.erb
@@ -5,8 +5,8 @@
       data: { controller: "form", turbo_frame: "cards_container", turbo_action: "advance" } do |form| %>
   <%= tag.div class: "flex-inline position-relative quick-filter",
         data: {
-          controller: "dialog multi-selection-combobox",
-          action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside turbo:morph@window->multi-selection-combobox#refresh",
+          controller: "dialog filter multi-selection-combobox",
+          action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside turbo:morph@window->multi-selection-combobox#refresh dialog:close@document->filter#clearInput",
           filter_show: user_filtering.show_boards?,
           multi_selection_combobox_no_selection_label_value: user_filtering.selected_boards_label } do %>
         <button type="button" class="btn borderless btn--plain events__filter-select" data-action="click->dialog#toggle:stop">
diff --git a/app/views/filters/settings/_assignees.html.erb b/app/views/filters/settings/_assignees.html.erb
index 0a60a4878..519fc2546 100644
--- a/app/views/filters/settings/_assignees.html.erb
+++ b/app/views/filters/settings/_assignees.html.erb
@@ -1,8 +1,8 @@
 <% filter = user_filtering.filter %>
 <%= tag.div class: "quick-filter",
       data: {
-        controller: "dialog multi-selection-combobox",
-        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
+        controller: "dialog filter multi-selection-combobox",
+        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside dialog:close@document->filter#clearInput",
         filter_show: user_filtering.show_assignees?,
         multi_selection_combobox_no_selection_label_value: "Assigned to…",
         multi_selection_combobox_label_prefix_value: "Assigned to" } do %>
diff --git a/app/views/filters/settings/_boards.html.erb b/app/views/filters/settings/_boards.html.erb
index 97a21618d..56abeeb8c 100644
--- a/app/views/filters/settings/_boards.html.erb
+++ b/app/views/filters/settings/_boards.html.erb
@@ -2,8 +2,8 @@
 
 <%= tag.div class: "quick-filter",
       data: {
-        controller: "dialog multi-selection-combobox",
-        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
+        controller: "dialog filter multi-selection-combobox",
+        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside dialog:close->filter#clearInput",
         filter_show: user_filtering.show_boards?,
         multi_selection_combobox_no_selection_label_value: "Board…",
         multi_selection_combobox_label_prefix_value: "" } do %>
diff --git a/app/views/filters/settings/_closers.html.erb b/app/views/filters/settings/_closers.html.erb
index 24e542b1e..a4ca4eb76 100644
--- a/app/views/filters/settings/_closers.html.erb
+++ b/app/views/filters/settings/_closers.html.erb
@@ -2,8 +2,8 @@
 
 <%= tag.div class: "quick-filter",
       data: {
-        controller: "dialog multi-selection-combobox",
-        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
+        controller: "dialog filter multi-selection-combobox",
+        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside dialog:close@document->filter#clearInput",
         filter_show: user_filtering.show_closers?,
         multi_selection_combobox_no_selection_label_value: "Closed by…",
         multi_selection_combobox_label_prefix_value: "Closed by" } do %>
diff --git a/app/views/filters/settings/_creators.html.erb b/app/views/filters/settings/_creators.html.erb
index 8453fe745..4956c5f92 100644
--- a/app/views/filters/settings/_creators.html.erb
+++ b/app/views/filters/settings/_creators.html.erb
@@ -2,8 +2,8 @@
 
 <%= tag.div class: "quick-filter",
       data: {
-        controller: "dialog multi-selection-combobox",
-        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
+        controller: "dialog filter multi-selection-combobox",
+        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside dialog:close@document->filter#clearInput",
         filter_show: user_filtering.show_creators?,
         multi_selection_combobox_no_selection_label_value: "Added by…",
         multi_selection_combobox_label_prefix_value: "Added by" } do %>
diff --git a/app/views/filters/settings/_indexed_by.html.erb b/app/views/filters/settings/_indexed_by.html.erb
index 8175fea9e..c806261c2 100644
--- a/app/views/filters/settings/_indexed_by.html.erb
+++ b/app/views/filters/settings/_indexed_by.html.erb
@@ -1,8 +1,8 @@
 <% filter = user_filtering.filter %>
 
 <%= tag.div class: class_names("quick-filter"),
-      data: { controller: "dialog combobox",
-            action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
+      data: { controller: "dialog filter combobox",
+            action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside dialog:close@document->filter#clearInput",
             filter_show: user_filtering.show_indexed_by?,
             combobox_default_value_value: "all",
             combobox_default_label_value: "Status…",
diff --git a/app/views/filters/settings/_sorted_by.html.erb b/app/views/filters/settings/_sorted_by.html.erb
index e5c0adc4e..2b33b4bec 100644
--- a/app/views/filters/settings/_sorted_by.html.erb
+++ b/app/views/filters/settings/_sorted_by.html.erb
@@ -2,8 +2,8 @@
 
 <%= tag.div class: class_names("quick-filter"),
       data: {
-        controller: "dialog combobox",
-        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
+        controller: "dialog filter combobox",
+        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside dialog:close@document->filter#clearInput",
         filter_show: user_filtering.show_sorted_by?,
         combobox_default_value_value: "latest",
         combobox_with_default_class: "quick-filter--with-default" } do %>
diff --git a/app/views/filters/settings/_tags.html.erb b/app/views/filters/settings/_tags.html.erb
index 6d355327f..beb86b49e 100644
--- a/app/views/filters/settings/_tags.html.erb
+++ b/app/views/filters/settings/_tags.html.erb
@@ -2,8 +2,8 @@
 
 <%= tag.div class: "quick-filter",
       data: {
-        controller: "dialog multi-selection-combobox",
-        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside",
+        controller: "dialog filter multi-selection-combobox",
+        action: "keydown.esc->dialog#close click@document->dialog#closeOnClickOutside dialog:close@document->filter#clearInput",
         filter_show: user_filtering.show_tags?,
         multi_selection_combobox_no_selection_label_value: "Tagged…" } do %>
   <button type="button" class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#toggle:stop">