diff --git a/ui/src/Main.elm b/ui/src/Main.elm
index df6ccc8..dd80525 100644
--- a/ui/src/Main.elm
+++ b/ui/src/Main.elm
@@ -117,7 +117,16 @@ update msg model =
             LinkClicked req ->
                 case req of
                     Browser.Internal url ->
-                        ( model, Nav.pushUrl model.session.key (Url.toString url), Session.none )
+                        case url.fragment of
+                            Just "" ->
+                                -- Anchor tag for accessibility purposes only, already handled.
+                                ( model, Cmd.none, Session.none )
+
+                            _ ->
+                                ( model
+                                , Nav.pushUrl model.session.key (Url.toString url)
+                                , Session.none
+                                )
 
                     Browser.External url ->
                         ( model, Nav.load url, Session.none )
diff --git a/ui/src/Page/Mailbox.elm b/ui/src/Page/Mailbox.elm
index 7660254..9ea262a 100644
--- a/ui/src/Page/Mailbox.elm
+++ b/ui/src/Page/Mailbox.elm
@@ -573,7 +573,7 @@ messageBody message bodyMode =
             a
                 [ classList [ ( "active", bodyMode == mode ) ]
                 , onClick (MessageBody mode)
-                , href "javacript:void(0)"
+                , href "#"
                 ]
                 [ text label ]