diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index 66e856160..37bb710ba 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -3,11 +3,14 @@
         class: class_names("filters flex align-center gap-half justify-center center margin-block-end", { "filters--expanded": user_filtering.expanded? }),
         data: { controller: "toggle-class filter-settings", toggle_class_toggle_class: "filters--expanded", filter_settings_filters_set_class: "filters--has-filters-set" } do %>
     <div class="flex-inline center align-center gap-half" data-controller="toggle-enable">
-      <%= render "filters/settings/terms", user_filtering: user_filtering %>
-      <%= render "filters/settings/controls", user_filtering: user_filtering %>
+      <%= form_with url: cards_path, method: :get, class: "flex-inline center align-center gap-half",
+            data: { controller: "form", turbo_frame: "card_columns", turbo_action: "advance" } do |form| %>
+        <%= render "filters/settings/terms", user_filtering: user_filtering, form: form %>
+        <%= render "filters/settings/controls", user_filtering: user_filtering, form: form %>
 
-      <%= render "filters/settings/toggle", user_filtering: user_filtering %>
-      <%= render "filters/settings/manage", user_filtering: user_filtering %>
+        <%= render "filters/settings/toggle", user_filtering: user_filtering %>
+        <%= render "filters/settings/manage", user_filtering: user_filtering %>
+      <% end %>
     </div>
   <% end %>
 <% end %>
diff --git a/app/views/filters/settings/_controls.html.erb b/app/views/filters/settings/_controls.html.erb
index b765a5351..f0af14fd8 100644
--- a/app/views/filters/settings/_controls.html.erb
+++ b/app/views/filters/settings/_controls.html.erb
@@ -1,10 +1,9 @@
-<%= form_with url: cards_path, method: :get, class: "flex-inline center align-center gap-half",
-      data: { controller: "form", turbo_frame: "card_columns", turbo_action: "advance" } do |form| %>
-  <%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
-  <%= render "filters/settings/sorted_by", user_filtering: user_filtering %>
-  <%= render "filters/settings/indexed_by", user_filtering: user_filtering %>
-  <%= render "filters/settings/tags", user_filtering: user_filtering %>
-  <%= render "filters/settings/assignees", user_filtering: user_filtering %>
-  <%= render "filters/settings/creators", user_filtering: user_filtering %>
-  <%= render "filters/settings/closers", user_filtering: user_filtering %>
-<% end %>
+<%= hidden_field_tag :expand_all, true, disabled: !user_filtering.expanded?, data: { toggle_enable_target: "element" } %>
+
+<%= render "filters/settings/sorted_by", user_filtering: user_filtering %>
+<%= render "filters/settings/indexed_by", user_filtering: user_filtering %>
+<%= render "filters/settings/tags", user_filtering: user_filtering %>
+<%= render "filters/settings/assignees", user_filtering: user_filtering %>
+<%= render "filters/settings/creators", user_filtering: user_filtering %>
+<%= render "filters/settings/closers", user_filtering: user_filtering %>
+
diff --git a/app/views/filters/settings/_terms.html.erb b/app/views/filters/settings/_terms.html.erb
index d9f6c448c..a388b520f 100644
--- a/app/views/filters/settings/_terms.html.erb
+++ b/app/views/filters/settings/_terms.html.erb
@@ -1,5 +1,4 @@
 <% filter = user_filtering.filter %>
-<%= form_with url: cards_path, method: :get, class: "", data: { controller: "form", turbo_frame: "card_columns", action: "input->form#debouncedSubmit" } do |form| %>
   <% filter.as_params.except(:terms).each do |key, value| %>
     <%= filter_hidden_field_tag key, value %>
   <% end %>
@@ -13,8 +12,7 @@
   <% end %>
 
   <%= form.text_field "terms[]", placeholder: "Filter these cards…", class: "input txt-x-small filter__terms",
-        autofocus: false, autocomplete: :off, autocorrect: "off", data: { "1p-ignore": "true", action: "keydown.enter->form#submitToTopTarget" } %>
-<% end %>
+        autofocus: false, autocomplete: :off, autocorrect: "off", data: { "1p-ignore": "true", action: "input->form#debouncedSubmit keydown.enter->form#submitToTopTarget" } %>
 
 <% if filter.terms.present? %>
   <% filter.terms.each do |term| %>