diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcd6c8109a..863f21ca02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,9 @@ and this project adheres to
   [PR#4551](https://github.com/OpenFn/lightning/pull/4551)
 - Fix AI assistant authorization for support users on projects with support
   access enabled [#4571](https://github.com/OpenFn/lightning/issues/4571)
+- Support mailto link no longer opens a blank tab; email address is shown as
+  a tooltip for users without a mail client configured
+  [#2435](https://github.com/OpenFn/lightning/issues/2435)
 
 ## [2.16.0] - 2026-03-24
 
diff --git a/lib/lightning_web/components/layouts/live.html.heex b/lib/lightning_web/components/layouts/live.html.heex
index b8953b59a3..575ad99700 100644
--- a/lib/lightning_web/components/layouts/live.html.heex
+++ b/lib/lightning_web/components/layouts/live.html.heex
@@ -66,9 +66,17 @@
                   <.icon name="hero-user-group-mini" class="h-5 w-5 shrink-0" />
                   <span class="menu-item-text truncate">Community</span>
                 </Menu.menu_item>
-                <Menu.menu_item href={"mailto:" <> Lightning.Config.instance_admin_email()}>
+                <Menu.menu_item
+                  href={"mailto:" <> Lightning.Config.instance_admin_email()}
+                  target="_self"
+                >
                   <.icon name="hero-lifebuoy-mini" class="h-5 w-5 shrink-0" />
-                  <span class="menu-item-text truncate">Support</span>
+                  <span
+                    class="menu-item-text truncate"
+                    title={Lightning.Config.instance_admin_email()}
+                  >
+                    Support
+                  </span>
                 </Menu.menu_item>
               <% end %>
             <% end %>