diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte
index 4bcfa542e8..b053de8ecf 100644
--- a/src/lib/components/layout/Sidebar.svelte
+++ b/src/lib/components/layout/Sidebar.svelte
@@ -737,8 +737,9 @@
 					createFolder();
 				}}
 				onAddLabel={$i18n.t('New Folder')}
-				on:change={(e) => {
+				on:change={async (e) => {
 					selectedFolder.set(null);
+					await goto('/');
 				}}
 				on:import={(e) => {
 					importChatHandler(e.detail);
diff --git a/src/lib/components/layout/Sidebar/RecursiveFolder.svelte b/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
index db2d8d3a55..24e30e0a6a 100644
--- a/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
+++ b/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
@@ -426,10 +426,9 @@
 					renameHandler();
 				}}
 				on:click={async (e) => {
+					await goto('/');
+
 					selectedFolder.set(folders[folderId]);
-					if ($chatId) {
-						await goto('/');
-					}
 				}}
 			>
 				<div class="text-gray-300 dark:text-gray-600">