diff --git a/src/components/NavItem.astro b/src/components/NavItem.astro
--- a/src/components/NavItem.astro
+++ b/src/components/NavItem.astro
@@ -1,6 +1,6 @@
 ---
 const { href, label } = Astro.props;
-const pathname = new URL(Astro.request.url).pathname;
-const isCurrent = href === pathname;
+const callerUrl = new URL(Astro.url.pathname, import.meta.env.SITE).href;
+const tabUrl = new URL(href, import.meta.env.SITE).href;
 ---
-<a {href}>{label}</a>
+<a {href} class={callerUrl === tabUrl ? "titular-navbar-tab" : ""}>{label}</a>
diff --git a/src/components/Navigation.astro b/src/components/Navigation.astro
--- a/src/components/Navigation.astro
+++ b/src/components/Navigation.astro
@@ -7,20 +7,3 @@ <NavItem href="/about" label="About" />
   <NavItem href="/blog" label="Blog" />
   <NavItem href="/projects" label="Projects" />
 </nav>
-
-<script>
-  document.addEventListener("astro:before-swap", () => {
-    /*
-     * Stolen from https://gist.github.com/leabs/11e9f20a5580982428824148f62eb2a0
-     * Thanks, Leabs!
-     */
-    const nav = document.querySelector("nav");
-    const navLinks = nav.querySelectorAll("a");
-    const currentURL = window.location.href;
-    navLinks.forEach((link) => {
-      if (link.href === currentURL) {
-        link.classList.add("titular-navbar-tab");
-      }
-    });
-  });
-</script>
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -2,7 +2,6 @@ ---
 import "../styles/global.css";
 import Header from "../components/Header.astro";
 import Footer from "../components/Footer.astro";
-import { ClientRouter } from "astro:transitions";
 const { pageTitle } = Astro.props;
 ---
 
@@ -23,4 +22,3 @@ </main>
     <Footer />
   </body>
 </html>
-<ClientRouter />