diff --git a/app/assets/stylesheets/utilities.css b/app/assets/stylesheets/utilities.css
index 6ad6b2089..1c61680f1 100644
--- a/app/assets/stylesheets/utilities.css
+++ b/app/assets/stylesheets/utilities.css
@@ -49,6 +49,8 @@
 
   .contain { contain: inline-size; }
 
+  .display-inline { display: inline; }
+
   .flex { display: flex; }
   .flex-inline { display: inline-flex; }
   .flex-column { flex-direction: column; }
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 95545d536..0c5ef2a0d 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -7,12 +7,13 @@
   <%= render "events/index/add_card_button", user_filtering: @user_filtering %>
 
   <h1 class="header__title">
-    <% if @user_filtering.boards.one? %>
-      Latest Activity
-    <% else %>
+    <% if @user_filtering.boards.many? %>
       <span>Activity <%= @user_filtering.filter.boards.any? ? "in" : "across" %></span>
-      <%= render "events/index/filter", user_filtering: @user_filtering %>
+    <% else %>
+      <span>Latest Activity</span>
     <% end %>
+
+    <%= render "events/index/filter", user_filtering: @user_filtering %>
   </h1>
 
   <%= render "events/index/add_board_button", user_filtering: @user_filtering %>
diff --git a/app/views/events/index/_filter.html.erb b/app/views/events/index/_filter.html.erb
index d3dcf5d2b..cb6a37d36 100644
--- a/app/views/events/index/_filter.html.erb
+++ b/app/views/events/index/_filter.html.erb
@@ -1,9 +1,13 @@
 <%= form_with url: events_path,
-      method: :get, class: "flex-inline flex-wrap position-relative justify-center",
+      method: :get, class: "display-inline position-relative",
       data: { controller: "form", turbo_frame: "cards_container", turbo_action: "advance" } do |form| %>
-  <%= render "events/index/filter/board", user_filtering: %>
 
-  <span>&nbsp;by&nbsp;</span>
+  <% unless user_filtering.boards.one? %>
+    <%= render "events/index/filter/board", user_filtering: %>
+  <% end %>
 
-  <%= render "events/index/filter/user", user_filtering: %>
+  <% unless user_filtering.users.one? %>
+    <span>by</span>
+    <%= render "events/index/filter/user", user_filtering: %>
+  <% end %>
 <% end %>
diff --git a/app/views/events/index/filter/_board.html.erb b/app/views/events/index/filter/_board.html.erb
index bef6bd085..326ce77f9 100644
--- a/app/views/events/index/filter/_board.html.erb
+++ b/app/views/events/index/filter/_board.html.erb
@@ -17,11 +17,8 @@
 
   <%= filter_dialog "Board…" do %>
     <strong class="popup__title">Board…</strong>
-
-    <% if user_filtering.boards.many? %>
-      <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small font-weight-normal", autofocus: true,
-            type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
-    <% end %>
+    <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small font-weight-normal", autofocus: true,
+          type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
 
     <ul class="popup__list" data-filter-target="list" role="listbox">
       <% user_filtering.boards.each do |board| %>
diff --git a/app/views/events/index/filter/_user.html.erb b/app/views/events/index/filter/_user.html.erb
index 83262d084..e5b37a8a2 100644
--- a/app/views/events/index/filter/_user.html.erb
+++ b/app/views/events/index/filter/_user.html.erb
@@ -17,11 +17,8 @@
 
   <%= filter_dialog "Person…" do %>
     <strong class="popup__title">Person…</strong>
-
-    <% if user_filtering.users.many? %>
-      <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small font-weight-normal", autofocus: true,
-            type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
-    <% end %>
+    <%= text_field_tag nil, nil, id: nil, placeholder: "Filter…", class: "input input--transparent txt-small font-weight-normal", autofocus: true,
+          type: "search", autocorrect: "off", autocomplete: "off", data: { "1p-ignore": "true", filter_target: "input", action: "input->filter#filter" } %>
 
     <ul class="popup__list" data-filter-target="list" role="listbox">
       <% user_filtering.users.each do |user| %>