diff --git a/app/assets/stylesheets/nav.css b/app/assets/stylesheets/nav.css
index c48a78034..668733520 100644
--- a/app/assets/stylesheets/nav.css
+++ b/app/assets/stylesheets/nav.css
@@ -71,14 +71,14 @@
                 0 0.8em 0.8em oklch(var(--lch-blue-medium) / 5%);
     grid-template-rows: auto 1fr auto;
     gap: var(--nav-section-gap);
-    max-block-size: calc(100vh - var(--block-space) - var(--footer-height));
+    max-block-size: calc(100dvh - var(--block-space) - var(--footer-height));
     overflow: hidden;
     padding-block-end: 0;
     scrollbar-gutter: stable both-edges;
     z-index: var(--z-nav);
 
     @media (max-height: 668px) {
-      max-block-size: calc(100vh - var(--block-space));
+      max-block-size: calc(100dvh - var(--block-space));
     }
   }
 
diff --git a/app/helpers/my/menu_helper.rb b/app/helpers/my/menu_helper.rb
index 753bad6a2..7cad2a25f 100644
--- a/app/helpers/my/menu_helper.rb
+++ b/app/helpers/my/menu_helper.rb
@@ -11,6 +11,7 @@ module My::MenuHelper
       aria: { activedescendant: "" },
       data: {
         "1p-ignore": "true",
+        dialog_target: "focusMouse",
         filter_target: "input",
         nav_section_expander_target: "input",
         navigable_list_target: "input",
diff --git a/app/views/my/menus/_jump.html.erb b/app/views/my/menus/_jump.html.erb
index f22bedf23..cc1000770 100644
--- a/app/views/my/menus/_jump.html.erb
+++ b/app/views/my/menus/_jump.html.erb
@@ -1,6 +1,6 @@
 <div class="flex gap">
   <div class="flex flex-column full-width justify-center gap-half">
-    <div class="nav__header">
+    <div class="nav__header" tabindex="-1" data-dialog-target="focusTouch">
       <% if Current.identity.accounts.many? %>
         <div class="nav__header-title max-width">
           <div class="overflow-ellipsis"><strong><%= Current.account.name %></strong></div>