diff --git a/src/Navigation.svelte b/src/Navigation.svelte
index a56b4ab..1ee9c28 100644
--- a/src/Navigation.svelte
+++ b/src/Navigation.svelte
@@ -73,8 +73,7 @@
                     {#each Routes.sidebarRoutes as route}
                         <li>
                             <a
-                                class:border-b-2={`/${window.location.pathname.split("/")[1]}` ==
-                                    route.url}
+                                class:border-b-2={isCurrentPath(route.url)}
                                 class="border-b-0 border-accent transition-colors hover:text-accent"
                                 href={route.url}
                                 target={route.target}
@@ -111,7 +110,7 @@
             href={route.url}
             target={route.target}
             class={`flex flex-col items-center decoration-accent transition-opacity ${
-                `/${window.location.pathname.split("/")[1]}` == route.url
+                isCurrentPath(route.url)
                     ? "underline opacity-100"
                     : "opacity-50"
             }`}