diff --git a/app/assets/stylesheets/events.css b/app/assets/stylesheets/events.css
index 6a52349fe..1d7f2264c 100644
--- a/app/assets/stylesheets/events.css
+++ b/app/assets/stylesheets/events.css
@@ -122,10 +122,6 @@
     text-align: center;
   }
 
-  .events__popup {
-    margin-block-start: var(--block-space-half);
-  }
-
   /* Event
   /* ------------------------------------------------------------------------ */
 
diff --git a/app/views/cards/index/_closure_filter.html.erb b/app/views/cards/index/_closure_filter.html.erb
index 258e20d4a..da5b5bf22 100644
--- a/app/views/cards/index/_closure_filter.html.erb
+++ b/app/views/cards/index/_closure_filter.html.erb
@@ -3,7 +3,7 @@
     Recently closed
   </button>
 
-  <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
+  <dialog class="margin-block-start-half popup panel flex-column align-start gap-half fill-white shadow"
     aria-label="Closed with reason…" aria-description="Closed with reason…"
     data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
     <strong class="popup__title margin-block-start-half pad-inline-half">Closed with reason…</strong>
diff --git a/app/views/cards/index/_workflow_filter.html.erb b/app/views/cards/index/_workflow_filter.html.erb
index 49f2cc31b..d453917d5 100644
--- a/app/views/cards/index/_workflow_filter.html.erb
+++ b/app/views/cards/index/_workflow_filter.html.erb
@@ -7,7 +7,7 @@
     <% end %>
   </button>
 
-  <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
+  <dialog class="margin-block-start-half 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(s)…</strong>
diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index 8a42c1c3f..8b3281289 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -13,7 +13,7 @@
         <strong class="txt-medium overflow-ellipsis margin-none">Fizzy</strong>
 		<% end %>
 
-	<%= tag.dialog class: "fizzy-dialog filter events__popup popup popup--animated panel flex-column align-start fill-white",
+	<%= tag.dialog class: "fizzy-dialog filter margin-block-start-half popup popup--animated panel flex-column align-start fill-white",
 			data: {
 				action: "turbo:before-cache@document->dialog#close keydown->navigable-list#navigate filter:changed->navigable-list#reset toggle->filter#filter",
 				controller: "filter navigable-list",
diff --git a/app/views/filters/_assignees.html.erb b/app/views/filters/_assignees.html.erb
index 2b4d684ee..7c6b42d78 100644
--- a/app/views/filters/_assignees.html.erb
+++ b/app/views/filters/_assignees.html.erb
@@ -12,7 +12,7 @@
       </span>
     </button>
 
-    <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
+    <dialog class="margin-block-start-half popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
       <strong class="popup__title margin-block-start-half pad-inline-half overflow-ellipsis">Assigned to…</strong>
       <%= form_with url: cards_path, method: :get, class: "popup__list",
             data: { controller: "form" } do |form| %>
diff --git a/app/views/filters/_creators.html.erb b/app/views/filters/_creators.html.erb
index 5c9e48b83..79eb105fa 100644
--- a/app/views/filters/_creators.html.erb
+++ b/app/views/filters/_creators.html.erb
@@ -11,7 +11,7 @@
       </span>
     </button>
 
-    <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
+    <dialog class="margin-block-start-half popup panel flex-column align-start gap-half fill-white shadow"
         aria-label="Added by…" aria-description="Added by…"
         data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
       <strong class="popup__title margin-block-start-half pad-inline-half">Added by…</strong>
diff --git a/app/views/filters/_indexed_by.html.erb b/app/views/filters/_indexed_by.html.erb
index bc87053b5..8144e9afb 100644
--- a/app/views/filters/_indexed_by.html.erb
+++ b/app/views/filters/_indexed_by.html.erb
@@ -6,7 +6,7 @@
       </span>
     </button>
 
-    <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
+    <dialog class="margin-block-start-half popup panel flex-column align-start gap-half fill-white shadow"
         aria-label="Sort by…" aria-description="Sort by…"
         data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
       <strong class="popup__title margin-block-start-half pad-inline-half">Sort by…</strong>
diff --git a/app/views/filters/_stages.html.erb b/app/views/filters/_stages.html.erb
index db44cbd32..8561f6364 100644
--- a/app/views/filters/_stages.html.erb
+++ b/app/views/filters/_stages.html.erb
@@ -10,7 +10,7 @@
       </span>
     </button>
 
-    <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow"
+    <dialog class="margin-block-start-half 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 overflow-ellipsis">In stage…</strong>
diff --git a/app/views/filters/_tags.html.erb b/app/views/filters/_tags.html.erb
index b3b964784..476fd98cc 100644
--- a/app/views/filters/_tags.html.erb
+++ b/app/views/filters/_tags.html.erb
@@ -10,7 +10,7 @@
       </span>
     </button>
 
-    <dialog class="events__popup popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
+    <dialog class="margin-block-start-half popup panel flex-column align-start gap-half fill-white shadow" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
       <strong class="popup__title margin-block-start-half pad-inline-half overflow-ellipsis">Tagged…</strong>
       <%= form_with url: cards_path, method: :get, class: "popup__list",
             data: { controller: "form" } do |form| %>