diff --git a/src/lib/components/chat/SettingsModal.svelte b/src/lib/components/chat/SettingsModal.svelte
index 118a0c0ea2..cd9bf74ec1 100644
--- a/src/lib/components/chat/SettingsModal.svelte
+++ b/src/lib/components/chat/SettingsModal.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { browser } from '$app/environment';
 	import { getContext, onMount, tick } from 'svelte';
 	import type { Writable } from 'svelte/store';
 	import { toast } from 'svelte-sonner';
@@ -783,6 +784,8 @@
 		} else if (filteredSettings.length > 0 && !filteredSettings.includes(selectedTab)) {
 			selectedTab = filteredSettings[0];
 		}
+
+		scrollToSelectedTab();
 	};
 
 	const saveSettings = async (updated: Record<string, any>) => {
@@ -823,10 +826,26 @@
 		}`;
 
 	let selectedTab = 'general';
+	const scrollToSelectedTab = async () => {
+		if (!browser || !modalShow || !selectedTab) {
+			return;
+		}
+
+		await tick();
+		const tabElement = document.querySelector<HTMLElement>(
+			'#settings-tabs-container [role="tab"][aria-selected="true"]'
+		);
+		tabElement?.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' });
+	};
+
 	$: if ($user?.role !== 'admin' && isAdminTab(selectedTab)) {
 		selectedTab = 'general';
 	}
 
+	$: if (modalShow && selectedTab) {
+		scrollToSelectedTab();
+	}
+
 	onMount(() => {
 		availableSettings = getAvailableSettings();
 		setFilteredSettings();