diff --git a/src/lib/components/admin/Settings.svelte b/src/lib/components/admin/Settings.svelte
index c26604d6c..564d81c85 100644
--- a/src/lib/components/admin/Settings.svelte
+++ b/src/lib/components/admin/Settings.svelte
@@ -1,5 +1,7 @@
 <script>
 	import { getContext, tick, onMount } from 'svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
 	import { toast } from 'svelte-sonner';
 
 	import { config } from '$lib/stores';
@@ -26,6 +28,13 @@
 
 	let selectedTab = 'general';
 
+	// Get current tab from URL pathname, default to 'general'
+	$: {
+		const pathParts = $page.url.pathname.split('/');
+		const tabFromPath = pathParts[pathParts.length - 1];
+		selectedTab = ['general', 'connections', 'models', 'evaluations', 'tools', 'documents', 'web', 'code-execution', 'interface', 'audio', 'images', 'pipelines', 'db'].includes(tabFromPath) ? tabFromPath : 'general';
+	}
+
 	onMount(() => {
 		const containerElement = document.getElementById('admin-settings-tabs-container');
 
@@ -51,7 +60,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'general';
+				goto('/admin/settings/general');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -77,7 +86,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'connections';
+				goto('/admin/settings/connections');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -101,7 +110,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'models';
+				goto('/admin/settings/models');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -127,7 +136,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'evaluations';
+				goto('/admin/settings/evaluations');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -142,7 +151,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'tools';
+				goto('/admin/settings/tools');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -168,7 +177,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'documents';
+				goto('/admin/settings/documents');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -198,7 +207,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'web';
+				goto('/admin/settings/web');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -222,7 +231,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'code-execution';
+				goto('/admin/settings/code-execution');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -248,7 +257,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'interface';
+				goto('/admin/settings/interface');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -274,7 +283,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'audio';
+				goto('/admin/settings/audio');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -301,7 +310,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'images';
+				goto('/admin/settings/images');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -327,7 +336,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'pipelines';
+				goto('/admin/settings/pipelines');
 			}}
 		>
 			<div class=" self-center mr-2">
@@ -357,7 +366,7 @@
 				? ''
 				: ' text-gray-300 dark:text-gray-600 hover:text-gray-700 dark:hover:text-white'}"
 			on:click={() => {
-				selectedTab = 'db';
+				goto('/admin/settings/db');
 			}}
 		>
 			<div class=" self-center mr-2">
diff --git a/src/routes/(app)/admin/settings/+page.svelte b/src/routes/(app)/admin/settings/+page.svelte
index a0a86f435..d8a497cb2 100644
--- a/src/routes/(app)/admin/settings/+page.svelte
+++ b/src/routes/(app)/admin/settings/+page.svelte
@@ -1,5 +1,11 @@
 <script>
+	import { goto } from '$app/navigation';
+	import { onMount } from 'svelte';
 	import Settings from '$lib/components/admin/Settings.svelte';
+
+	onMount(() => {
+		goto('/admin/settings/general');
+	});
 </script>
 
 <Settings />
diff --git a/src/routes/(app)/admin/settings/audio/+page.svelte b/src/routes/(app)/admin/settings/audio/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/audio/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/code-execution/+page.svelte b/src/routes/(app)/admin/settings/code-execution/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/code-execution/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/connections/+page.svelte b/src/routes/(app)/admin/settings/connections/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/connections/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/db/+page.svelte b/src/routes/(app)/admin/settings/db/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/db/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/documents/+page.svelte b/src/routes/(app)/admin/settings/documents/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/documents/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/evaluations/+page.svelte b/src/routes/(app)/admin/settings/evaluations/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/evaluations/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/general/+page.svelte b/src/routes/(app)/admin/settings/general/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/general/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/images/+page.svelte b/src/routes/(app)/admin/settings/images/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/images/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/interface/+page.svelte b/src/routes/(app)/admin/settings/interface/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/interface/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/models/+page.svelte b/src/routes/(app)/admin/settings/models/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/models/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/pipelines/+page.svelte b/src/routes/(app)/admin/settings/pipelines/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/pipelines/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/tools/+page.svelte b/src/routes/(app)/admin/settings/tools/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/tools/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />
diff --git a/src/routes/(app)/admin/settings/web/+page.svelte b/src/routes/(app)/admin/settings/web/+page.svelte
new file mode 100644
index 000000000..a0a86f435
--- /dev/null
+++ b/src/routes/(app)/admin/settings/web/+page.svelte
@@ -0,0 +1,5 @@
+<script>
+	import Settings from '$lib/components/admin/Settings.svelte';
+</script>
+
+<Settings />