diff --git a/src/lib/components/chat/Settings/DataControls.svelte b/src/lib/components/chat/Settings/DataControls.svelte
index 5a44d2ceae..68b6ea5bd0 100644
--- a/src/lib/components/chat/Settings/DataControls.svelte
+++ b/src/lib/components/chat/Settings/DataControls.svelte
@@ -141,7 +141,7 @@
 	}}
 />
 
-<div id="tab-chats" class="flex flex-col h-full text-sm">
+<div id="tab-data-controls" class="flex flex-col h-full text-sm">
 	<h2 class="text-sm font-medium text-gray-900 dark:text-white mb-4">
 		{$i18n.t('settings.personal.dataControls.title')}
 	</h2>
diff --git a/src/lib/components/chat/Settings/Usage.svelte b/src/lib/components/chat/Settings/Usage.svelte
index 1d9f0587f8..2c24287faf 100644
--- a/src/lib/components/chat/Settings/Usage.svelte
+++ b/src/lib/components/chat/Settings/Usage.svelte
@@ -273,7 +273,7 @@
 	onMount(loadUsage);
 </script>
 
-<div class="flex h-full min-h-0 flex-col">
+<div id="tab-usage" class="flex h-full min-h-0 flex-col">
 	<div class="mb-4">
 		<h2 class="text-sm font-medium text-gray-900 dark:text-white">
 			{$i18n.t('settings.personal.usage.title')}
diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte
index fb9e558a5e..f47041ea1a 100644
--- a/src/lib/components/chat/SettingsModal.svelte
+++ b/src/lib/components/chat/SettingsModal.svelte
@@ -841,7 +841,10 @@
 	</nav>
 
 	<div class="flex-1 min-w-0 min-h-0 p-4 md:px-5 flex flex-col">
-		<div class="flex-1 min-h-0 overflow-hidden">
+		<div
+			class="flex-1 min-h-0 overflow-hidden"
+			id={isAdminTab(selectedTab) ? adminTabPanelId(selectedTab) : undefined}
+		>
 			{#if selectedTab === 'general'}
 				<General
 					{getModels}