From 484f9d251fc374e89968d8a1bef83f4e6e48218e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20K=C3=BCng?= <matthias.kueng@blum.com>
Date: Mon, 27 Oct 2025 10:20:05 +0100
Subject: [PATCH] Closes #719
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Matthias Küng <matthias.kueng@blum.com>
---
 extension/extend-account-console-node/src/PageNav.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extension/extend-account-console-node/src/PageNav.tsx b/extension/extend-account-console-node/src/PageNav.tsx
index bb938ffc6..5ee21d47f 100644
--- a/extension/extend-account-console-node/src/PageNav.tsx
+++ b/extension/extend-account-console-node/src/PageNav.tsx
@@ -9,19 +9,24 @@ import {
 import { PropsWithChildren, MouseEvent as ReactMouseEvent, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useHref, useLinkClickHandler } from "react-router-dom";
+import { environment } from "./environment";
 import { routes } from "./routes";
 
 type NavLinkProps = NavItemProps & {
   path?: string;
 };
 
+function getFullUrl(path: string) {
+  return `${new URL(environment.baseUrl).pathname}${path}`;
+}
+
 const NavLink = ({
   path,
   isActive,
   children,
   onClick,
 }: PropsWithChildren<NavLinkProps>) => {
-  const menuItemPath = path!;
+  const menuItemPath = getFullUrl(path!) + location.search;
   const href = useHref(menuItemPath);
   const handleClick = useLinkClickHandler(menuItemPath);