diff --git a/src/routes/(app)/workspace/+layout.svelte b/src/routes/(app)/workspace/+layout.svelte
index 52f728cab5..d3c510d097 100644
--- a/src/routes/(app)/workspace/+layout.svelte
+++ b/src/routes/(app)/workspace/+layout.svelte
@@ -151,6 +151,7 @@
 						{#if $user?.role === 'admin' || $user?.permissions?.workspace?.models}
 							<a
 								draggable="false"
+								data-sveltekit-keepfocus
 								aria-current={activeWorkspaceSection === 'models' ? 'page' : null}
 								class="min-w-fit px-1 text-sm inline-flex items-center gap-1 {activeWorkspaceSection ===
 								'models'
@@ -168,6 +169,7 @@
 						{#if $user?.role === 'admin' || $user?.permissions?.workspace?.knowledge}
 							<a
 								draggable="false"
+								data-sveltekit-keepfocus
 								aria-current={activeWorkspaceSection === 'knowledge' ? 'page' : null}
 								class="min-w-fit px-1 text-sm inline-flex items-center gap-1 {activeWorkspaceSection ===
 								'knowledge'
@@ -185,6 +187,7 @@
 						{#if $user?.role === 'admin' || $user?.permissions?.workspace?.prompts}
 							<a
 								draggable="false"
+								data-sveltekit-keepfocus
 								aria-current={activeWorkspaceSection === 'prompts' ? 'page' : null}
 								class="min-w-fit px-1 text-sm inline-flex items-center gap-1 {activeWorkspaceSection ===
 								'prompts'
@@ -202,6 +205,7 @@
 						{#if $user?.role === 'admin' || $user?.permissions?.workspace?.skills}
 							<a
 								draggable="false"
+								data-sveltekit-keepfocus
 								aria-current={activeWorkspaceSection === 'skills' ? 'page' : null}
 								class="min-w-fit px-1 text-sm inline-flex items-center gap-1 {activeWorkspaceSection ===
 								'skills'
@@ -219,6 +223,7 @@
 						{#if $config?.features?.enable_tools && ($user?.role === 'admin' || $user?.permissions?.workspace?.tools)}
 							<a
 								draggable="false"
+								data-sveltekit-keepfocus
 								aria-current={activeWorkspaceSection === 'tools' ? 'page' : null}
 								class="min-w-fit px-1 text-sm inline-flex items-center gap-1 {activeWorkspaceSection ===
 								'tools'