diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte
index f79646ce6d..4bcfa542e8 100644
--- a/src/lib/components/layout/Sidebar.svelte
+++ b/src/lib/components/layout/Sidebar.svelte
@@ -885,13 +885,17 @@
 					<Folders
 						{folders}
 						{shiftKey}
+						onDelete={(folderId) => {
+							selectedFolder.set(null);
+							initChatList();
+						}}
+						on:update={() => {
+							initChatList();
+						}}
 						on:import={(e) => {
 							const { folderId, items } = e.detail;
 							importChatHandler(items, false, folderId);
 						}}
-						on:update={async (e) => {
-							initChatList();
-						}}
 						on:change={async () => {
 							initChatList();
 						}}
diff --git a/src/lib/components/layout/Sidebar/Folders.svelte b/src/lib/components/layout/Sidebar/Folders.svelte
index 5d5f596a07..e4661008a5 100644
--- a/src/lib/components/layout/Sidebar/Folders.svelte
+++ b/src/lib/components/layout/Sidebar/Folders.svelte
@@ -6,6 +6,8 @@
 	export let folders = {};
 	export let shiftKey = false;
 
+	export let onDelete = (folderId) => {};
+
 	let folderList = [];
 	// Get the list of folders that have no parent, sorted by name alphabetically
 	$: folderList = Object.keys(folders)
@@ -24,6 +26,7 @@
 		{folders}
 		{folderId}
 		{shiftKey}
+		{onDelete}
 		on:import={(e) => {
 			dispatch('import', e.detail);
 		}}
diff --git a/src/lib/components/layout/Sidebar/RecursiveFolder.svelte b/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
index c1199492cf..db2d8d3a55 100644
--- a/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
+++ b/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
@@ -49,6 +49,8 @@
 
 	export let parentDragged = false;
 
+	export let onDelete = (e) => {};
+
 	let folderElement;
 
 	let showEditFolderModal = false;
@@ -266,7 +268,7 @@
 
 		if (res) {
 			toast.success($i18n.t('Folder deleted successfully'));
-			dispatch('update');
+			onDelete(folderId);
 		}
 	};
 
@@ -519,6 +521,7 @@
 								folderId={childFolder.id}
 								{shiftKey}
 								parentDragged={dragged}
+								{onDelete}
 								on:import={(e) => {
 									dispatch('import', e.detail);
 								}}