diff --git a/app/views/events/_filter.html.erb b/app/views/events/_filter.html.erb
index ab5488fd4..104a707d5 100644
--- a/app/views/events/_filter.html.erb
+++ b/app/views/events/_filter.html.erb
@@ -8,24 +8,8 @@
 
 	<dialog class="events__popup popup popup--animated panel flex-column align-start gap-half fill-white shadow"
 				style="z-index: 5;" data-dialog-target="dialog" data-action="turbo:before-cache@document->dialog#close">
-		<div class="flex align-center full-width gap-half">
-			<span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.4em 0 0.6em;">
-				<%= icon_tag "filter" %>
-			</span>
-			<strong class="popup__title txt-medium">Collections</strong>
-			<button class="btn borderless txt-x-small flex-item-justify-end" data-action="click->dialog#close" >
-				<%= icon_tag "remove-med" %>
-				<span class="for-screen-reader">Close</span>
-			</button>
-		</div>
-
-		<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
-			<%= link_to new_collection_path, class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
-				<%= icon_tag "add" %>
-				<span>Add a new collection</span>
-			<% end %>
-		</div>
-		<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">
+		<%= render "events/filter/header" %>
+		<%= render "events/filter/new_collection_option" %>
 
 		<%= form_with url: events_path, method: :get, class: "flex flex-column max-width popup__list full-width",
 					data: { controller: "form" } do |form| %>
diff --git a/app/views/events/filter/_header.html.erb b/app/views/events/filter/_header.html.erb
new file mode 100644
index 000000000..27b5ccc6e
--- /dev/null
+++ b/app/views/events/filter/_header.html.erb
@@ -0,0 +1,10 @@
+<div class="flex align-center full-width gap-half">
+			<span class="btn borderless" style="pointer-events: none; --icon-size: 1.3em; --btn-padding: 0 0.4em 0 0.6em;">
+        <%= icon_tag "filter" %>
+      </span>
+  <strong class="popup__title txt-medium">Collections</strong>
+  <button class="btn borderless txt-x-small flex-item-justify-end" data-action="click->dialog#close" >
+    <%= icon_tag "remove-med" %>
+    <span class="for-screen-reader">Close</span>
+  </button>
+</div>
diff --git a/app/views/events/filter/_new_collection_option.html.erb b/app/views/events/filter/_new_collection_option.html.erb
new file mode 100644
index 000000000..3064516cd
--- /dev/null
+++ b/app/views/events/filter/_new_collection_option.html.erb
@@ -0,0 +1,7 @@
+<div class="popup__group flex align-center full-width gap-half overflow-ellipsis">
+  <%= link_to new_collection_path, class: "btn popup__new popup__item", style: "view-transition-name: new-collection" do %>
+    <%= icon_tag "add" %>
+    <span>Add a new collection</span>
+  <% end %>
+</div>
+<hr class="full-width separator--horizontal margin-none" style="--border-color: transparent;">