diff --git a/src/lib/components/admin/Evaluations/Leaderboard.svelte b/src/lib/components/admin/Evaluations/Leaderboard.svelte
index 487945f04..b5f2638a6 100644
--- a/src/lib/components/admin/Evaluations/Leaderboard.svelte
+++ b/src/lib/components/admin/Evaluations/Leaderboard.svelte
@@ -334,7 +334,7 @@
 	onClose={closeLeaderboardModal}
 />
 
-<div class="mt-0.5 mb-2 gap-1 flex flex-col md:flex-row justify-between">
+<div class="mt-0.5 mb-2 gap-1 flex flex-col md:flex-row justify-between sticky top-0 z-10 bg-gray-50 dark:bg-gray-900 py-2">
 	<div class="flex md:self-center text-lg font-medium px-0.5 shrink-0 items-center">
 		<div class=" gap-1">
 			{$i18n.t('Leaderboard')}
diff --git a/src/lib/components/admin/Users/UserList.svelte b/src/lib/components/admin/Users/UserList.svelte
index 0827d17ad..cad8db2b1 100644
--- a/src/lib/components/admin/Users/UserList.svelte
+++ b/src/lib/components/admin/Users/UserList.svelte
@@ -154,7 +154,7 @@
 		<Spinner className="size-5" />
 	</div>
 {:else}
-	<div class="mt-0.5 mb-2 gap-1 flex flex-col md:flex-row justify-between">
+	<div class="mt-0.5 mb-2 gap-1 flex flex-col md:flex-row justify-between sticky top-0 z-10 bg-gray-50 dark:bg-gray-900 py-2">
 		<div class="flex md:self-center text-lg font-medium px-0.5">
 			<div class="flex-shrink-0">
 				{$i18n.t('Users')}
@@ -494,7 +494,9 @@
 		ⓘ {$i18n.t("Click on the user role button to change a user's role.")}
 	</div>
 
+	{#if total > 30}
 	<Pagination bind:page count={total} perPage={30} />
+	{/if}
 {/if}
 
 {#if !$config?.license_metadata}