diff --git a/app/views/filters/_settings.html.erb b/app/views/filters/_settings.html.erb
index 76dd3f1f8..850cd786e 100644
--- a/app/views/filters/_settings.html.erb
+++ b/app/views/filters/_settings.html.erb
@@ -3,6 +3,7 @@
     <%= render "filters/tags", filter: filter %>
     <%= render "filters/assignees", filter: filter %>
     <%= render "filters/creators", filter: filter %>
+    <%= render "filters/stages", filter: filter %>
 
     <% filter.terms.each do |term| %>
       <%= filter_chip_tag %Q("#{term}"), filter.as_params_without(:terms, term) %>
diff --git a/app/views/filters/_stages.html.erb b/app/views/filters/_stages.html.erb
index 0172b0130..d20e8fc86 100644
--- a/app/views/filters/_stages.html.erb
+++ b/app/views/filters/_stages.html.erb
@@ -1,6 +1,6 @@
-<% if Workflow.any? %>
+<% if filter.stages.any? %>
   <div class="quick-filter position-relative" data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-    <button class="btn input input--select flex-inline txt-small" data-action="click->dialog#open:stop">
+    <button class="btn input input--select flex-inline txt-x-small" data-action="click->dialog#open:stop">
       <span class="overflow-ellipsis">
         <% if filter.stages.any? %>
           <%= filter.stages.map(&:name).to_sentence %>
@@ -13,14 +13,14 @@
     <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
         aria-label="In stage…" aria-description="In stage…"
         data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-      <strong class="popup__title margin-block-start-half pad-inline-half">In stage…</strong>
+      <strong class="popup__title margin-block-start-half pad-inline-half overflow-ellipsis">In stage…</strong>
       <%= form_with url: cards_path, method: :get, class: "flex flex-column full-width popup__list",
             data: { controller: "form" } do |form| %>
         <% filter.as_params.except(:stage_ids).each do |key, value| %>
           <%= filter_hidden_field_tag key, value %>
         <% end %>
 
-        <% Workflow.first.stages.each do |stage| %>
+        <% filter.stages.first.workflow.stages.each do |stage| %>
           <div class="btn popup__item">
             <%= form.check_box :stage_ids, {
               multiple: true,