diff --git a/src/lib/components/admin/Users/UserList.svelte b/src/lib/components/admin/Users/UserList.svelte
index 1bd59edbbb..dd0594ab87 100644
--- a/src/lib/components/admin/Users/UserList.svelte
+++ b/src/lib/components/admin/Users/UserList.svelte
@@ -72,6 +72,9 @@
 		}
 	};
 
+	const sortState = (key) =>
+		orderBy === key ? (direction === 'asc' ? 'ascending' : 'descending') : 'none';
+
 	const setSortKey = (key) => {
 		if (orderBy === key) {
 			direction = direction === 'asc' ? 'desc' : 'asc';
@@ -221,12 +224,12 @@
 		<table class="w-full text-sm text-left text-gray-500 dark:text-gray-400 table-auto max-w-full">
 			<thead class="text-xs text-gray-800 uppercase bg-transparent dark:text-gray-200">
 				<tr class=" border-b-[1.5px] border-gray-50 dark:border-gray-850/30">
-					<th
-						scope="col"
-						class="px-2.5 py-1.5 font-normal cursor-pointer select-none"
-						on:click={() => setSortKey('name')}
-					>
-						<div class="flex gap-1.5 items-center">
+					<th scope="col" class="font-normal select-none" aria-sort={sortState('name')}>
+						<button
+							type="button"
+							class="flex w-full gap-1.5 items-center px-2.5 py-1.5"
+							on:click={() => setSortKey('name')}
+						>
 							{$i18n.t('Name')}
 
 							{#if orderBy === 'name'}
@@ -242,14 +245,14 @@
 									<ChevronUp className="size-2" />
 								</span>
 							{/if}
-						</div>
+						</button>
 					</th>
-					<th
-						scope="col"
-						class="px-2.5 py-1.5 font-normal cursor-pointer select-none"
-						on:click={() => setSortKey('role')}
-					>
-						<div class="flex gap-1.5 items-center">
+					<th scope="col" class="font-normal select-none" aria-sort={sortState('role')}>
+						<button
+							type="button"
+							class="flex w-full gap-1.5 items-center px-2.5 py-1.5"
+							on:click={() => setSortKey('role')}
+						>
 							{$i18n.t('Role')}
 
 							{#if orderBy === 'role'}
@@ -265,14 +268,14 @@
 									<ChevronUp className="size-2" />
 								</span>
 							{/if}
-						</div>
+						</button>
 					</th>
-					<th
-						scope="col"
-						class="px-2.5 py-1.5 font-normal cursor-pointer select-none"
-						on:click={() => setSortKey('email')}
-					>
-						<div class="flex gap-1.5 items-center">
+					<th scope="col" class="font-normal select-none" aria-sort={sortState('email')}>
+						<button
+							type="button"
+							class="flex w-full gap-1.5 items-center px-2.5 py-1.5"
+							on:click={() => setSortKey('email')}
+						>
 							{$i18n.t('Email')}
 
 							{#if orderBy === 'email'}
@@ -288,15 +291,15 @@
 									<ChevronUp className="size-2" />
 								</span>
 							{/if}
-						</div>
+						</button>
 					</th>
 
-					<th
-						scope="col"
-						class="px-2.5 py-1.5 font-normal cursor-pointer select-none"
-						on:click={() => setSortKey('last_active_at')}
-					>
-						<div class="flex gap-1.5 items-center">
+					<th scope="col" class="font-normal select-none" aria-sort={sortState('last_active_at')}>
+						<button
+							type="button"
+							class="flex w-full gap-1.5 items-center px-2.5 py-1.5"
+							on:click={() => setSortKey('last_active_at')}
+						>
 							{$i18n.t('Last Active')}
 							<!-- {$i18n.t('Last Modified')} -->
 
@@ -313,14 +316,14 @@
 									<ChevronUp className="size-2" />
 								</span>
 							{/if}
-						</div>
+						</button>
 					</th>
-					<th
-						scope="col"
-						class="px-2.5 py-1.5 font-normal cursor-pointer select-none"
-						on:click={() => setSortKey('created_at')}
-					>
-						<div class="flex gap-1.5 items-center">
+					<th scope="col" class="font-normal select-none" aria-sort={sortState('created_at')}>
+						<button
+							type="button"
+							class="flex w-full gap-1.5 items-center px-2.5 py-1.5"
+							on:click={() => setSortKey('created_at')}
+						>
 							{$i18n.t('Created at')}
 							{#if orderBy === 'created_at'}
 								<span class="font-normal"
@@ -335,7 +338,7 @@
 									<ChevronUp className="size-2" />
 								</span>
 							{/if}
-						</div>
+						</button>
 					</th>
 
 					<th scope="col" class="px-2.5 py-1.5 font-normal text-right"></th>