diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb
index 5f12b9259..9ffa01941 100644
--- a/app/helpers/boards_helper.rb
+++ b/app/helpers/boards_helper.rb
@@ -1,6 +1,13 @@
 module BoardsHelper
-  def link_back_to_board(board)
-    back_link_to board.name, board, "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click click->turbo-navigation#backIfSamePath"
+  def link_back_to_board(board, bridged = false)
+    back_link_to board.name,
+      board,
+      "keydown.left@document->hotkey#click keydown.esc@document->hotkey#click click->turbo-navigation#backIfSamePath",
+      data: ({
+        bridge__buttons_target: "button",
+        bridge_icon_url: bridge_icon("board"),
+        bridge_title: "Go to #{board.name}"
+      } if bridged)
   end
 
   def link_to_edit_board(board)
diff --git a/app/views/cards/container/_closure_buttons.html.erb b/app/views/cards/container/_closure_buttons.html.erb
index 05e292315..990a17982 100644
--- a/app/views/cards/container/_closure_buttons.html.erb
+++ b/app/views/cards/container/_closure_buttons.html.erb
@@ -1,6 +1,6 @@
 <div class="flex gap-half">
   <%= link_to edit_card_path(card), class: "btn btn--circle-mobile borderless",
-        data: { controller: "hotkey", action: "keydown.e@document->hotkey#click", bridge__buttons_target: "button", bridge_title: "Edit", bridge_icon_url: bridge_icon("pencil"), turbo_frame: dom_id(card, :edit) } do %>
+        data: { controller: "hotkey", action: "keydown.e@document->hotkey#click", bridge__overflow_menu_target: "item", bridge_title: "Edit", turbo_frame: dom_id(card, :edit) } do %>
     <%= icon_tag "pencil", class: "icon--mobile-only" %>
     <span>Edit</span>
     <kbd class="txt-x-small hide-on-touch">e</kbd>
diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb
index bfaa9c676..b114c43df 100644
--- a/app/views/cards/show.html.erb
+++ b/app/views/cards/show.html.erb
@@ -7,7 +7,7 @@
 
 <% content_for :header do %>
   <div class="header__actions header__actions--start">
-    <%= link_back_to_board(@card.board) %>
+    <%= link_back_to_board(@card.board, bridged: true) %>
   </div>
 <% end %>