diff --git a/web-admin/src/features/public-urls/PublicURLsResourceTable.svelte b/web-admin/src/features/public-urls/PublicURLsResourceTable.svelte
index 0d54e2230a0..c940e681aae 100644
--- a/web-admin/src/features/public-urls/PublicURLsResourceTable.svelte
+++ b/web-admin/src/features/public-urls/PublicURLsResourceTable.svelte
@@ -98,9 +98,9 @@
       </div>
     </div>
   {:else}
-    <div class="border rounded-lg overflow-x-auto">
+    <div class="border rounded-lg overflow-auto max-h-[60vh]">
       <table class="w-full">
-        <thead>
+        <thead class="sticky top-0 z-10">
           <tr class="bg-surface-background border-b">
             <th class="table-header">Label</th>
             <th class="table-header">Dashboard</th>
diff --git a/web-admin/src/routes/[organization]/[project]/-/settings/public-urls/+page.svelte b/web-admin/src/routes/[organization]/[project]/-/settings/public-urls/+page.svelte
index 0eeefa5492a..3d9d03a0a8e 100644
--- a/web-admin/src/routes/[organization]/[project]/-/settings/public-urls/+page.svelte
+++ b/web-admin/src/routes/[organization]/[project]/-/settings/public-urls/+page.svelte
@@ -16,7 +16,7 @@
   $: organization = $page.params.organization;
   $: project = $page.params.project;
 
-  const PAGE_SIZE = 12;
+  const PAGE_SIZE = 50;
 
   $: magicAuthTokensInfiniteQuery =
     createAdminServiceListMagicAuthTokensInfinite(
@@ -35,6 +35,14 @@
       },
     );
 
+  // Auto-fetch all remaining pages
+  $: if (
+    $magicAuthTokensInfiniteQuery.hasNextPage &&
+    !$magicAuthTokensInfiniteQuery.isFetchingNextPage
+  ) {
+    void $magicAuthTokensInfiniteQuery.fetchNextPage();
+  }
+
   $: allRows =
     $magicAuthTokensInfiniteQuery.data?.pages.flatMap(
       (page) => page.tokens ?? [],