diff --git a/src/lib/components/navigation/NavLink.svelte b/src/lib/components/navigation/NavLink.svelte
index 843b323..5f26370 100644
--- a/src/lib/components/navigation/NavLink.svelte
+++ b/src/lib/components/navigation/NavLink.svelte
@@ -2,13 +2,14 @@
 	import type { NavLinkItem } from '$lib/types/Nav/NavLinkItem';
 	import type { SupabaseClient } from '@supabase/supabase-js';
 	import SignOut from '../SignOut.svelte';
+	import { page } from '$app/stores';
 
 	export let linkItem: NavLinkItem;
 	export let supabase: SupabaseClient | null = null;
 </script>
 
 {#if !linkItem.isSignout}
-	<a href={linkItem.href}>{linkItem.text}</a>
+	<a role="menuitem" href={linkItem.href} aria-current={linkItem.href === $page.url.pathname ? 'page' : undefined}>{linkItem.text}</a>
 {:else if supabase && linkItem.isSignout}
 	<SignOut {supabase} />
 {/if}
diff --git a/src/lib/components/navigation/NavLinks.svelte b/src/lib/components/navigation/NavLinks.svelte
index 652a58c..aa8a028 100644
--- a/src/lib/components/navigation/NavLinks.svelte
+++ b/src/lib/components/navigation/NavLinks.svelte
@@ -3,6 +3,7 @@
 	import type { Session } from '@supabase/supabase-js';
 	import NavLinkParent from './NavLinkParent.svelte';
 	import type SupabaseClient from '@supabase/supabase-js/dist/module/SupabaseClient';
+	import NavLink from './NavLink.svelte';
 
 	export let session: Session | null;
 	export let supabase: SupabaseClient | null = null;
@@ -68,7 +69,7 @@
 			{#if link.isParent}
 				<NavLinkParent linkItem={link} {isMobile} {supabase} />
 			{:else}
-				<a href={link.href}>{link.text}</a>
+				<NavLink linkItem={link} />
 			{/if}
 		</li>
 	{/each}