diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb
index 5e3fc8a1a..7d402efe9 100644
--- a/app/helpers/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
@@ -5,7 +5,8 @@ module BoardsHelper
 
   def link_to_edit_board(board)
     link_to edit_board_path(board), class: "btn", data: {
-      controller: "tooltip bridge--nav-button",
+      controller: "tooltip",
+      bridge__buttons_target: "button",
       bridge_icon_name: "gearshape.fill",
       bridge_title: "Settings"
     } do
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index c2a9320d0..ff418996b 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -4,16 +4,18 @@
 <%= turbo_stream_from @board %>
 
 <% content_for :header do %>
-  <div class="header__actions header__actions--start">
-    <%= link_to_webhooks(@board) if Current.user.admin? %>
-  </div>
+  <div data-controller="bridge--buttons">
+    <div class="header__actions header__actions--start">
+      <%= link_to_webhooks(@board) if Current.user.admin? %>
+    </div>
 
-  <h1 class="header__title divider divider--fade full-width" data-bridge--page-target="header">
-    <span class="overflow-ellipsis"><%= @board.name %></span>
-  </h1>
+    <h1 class="header__title divider divider--fade full-width" data-bridge--page-target="header">
+      <span class="overflow-ellipsis"><%= @board.name %></span>
+    </h1>
 
-  <div class="header__actions header__actions--end">
-    <%= link_to_edit_board @board %>
+    <div class="header__actions header__actions--end">
+      <%= link_to_edit_board @board %>
+    </div>
   </div>
 <% end %>