diff --git a/portal/static/js/components/pieces/Nav.mjs b/portal/static/js/components/pieces/Nav.mjs
index 3b8a0f5ada0febd7117ff732c26d3068d3a251c8..7a6052cbeef926675ed7768ddf5b69fec74cb995 100644
--- a/portal/static/js/components/pieces/Nav.mjs
+++ b/portal/static/js/components/pieces/Nav.mjs
@@ -1,6 +1,8 @@
 import { NavPageLink } from "./NavPageLink.mjs"
 import { logout, isLoggedIn } from "../../account.mjs"
 
+const hasQueryParam = (param, path) => param in m.parsePathname(path).params
+
 export const Nav = {
     view() {
         return m("nav.box", [
@@ -60,7 +62,9 @@ export const Nav = {
                                       iconOnly: true,
                                   })
                                 : m(NavPageLink, {
-                                      href: `/login?next=${m.route.get() || "/"}`,
+                                      href: hasQueryParam("next", m.route.get())
+                                          ? m.route.get()
+                                          : `/login?next=${m.route.get() || "/"}`,
                                       label: " Anmelden",
                                       icon: "fa-solid fa-right-to-bracket",
                                   }),