diff --git a/includes/nav.php b/includes/nav.php
index 88188e1..e631b39 100644
--- a/includes/nav.php
+++ b/includes/nav.php
@@ -69,8 +69,13 @@ $_navAssetBase = str_contains($_navScriptPath, '/dashboard/') ? '../assets' : 'a
 
     <div class="dbn-nav__right">
         <nav class="dbn-nav__langs" aria-label="Language">
-<?php foreach (dbnToolsSupportedLanguages() as $lc): ?>
-            <a href="<?= htmlspecialchars($_navPath . '?lang=' . $lc) ?>"
+<?php
+    $_navQueryBase = $_GET;
+    foreach (dbnToolsSupportedLanguages() as $lc):
+        $_navQueryBase['lang'] = $lc;
+        $_navLangHref = $_navPath . '?' . http_build_query($_navQueryBase);
+?>
+            <a href="<?= htmlspecialchars($_navLangHref) ?>"
                class="dbn-nav__lang<?= $lc === $_navLang ? ' is-active' : '' ?>"
                hreflang="<?= htmlspecialchars($lc) ?>"
                aria-label="<?= htmlspecialchars(dbnToolsLanguageName($lc)) ?>"