diff --git a/src/lib/components/layout/Sidebar/ChatItem.svelte b/src/lib/components/layout/Sidebar/ChatItem.svelte
index 2a43911221..a605b1f7d6 100644
--- a/src/lib/components/layout/Sidebar/ChatItem.svelte
+++ b/src/lib/components/layout/Sidebar/ChatItem.svelte
@@ -25,7 +25,8 @@
 		pinnedChats,
 		showSidebar,
 		currentChatPage,
-		tags
+		tags,
+		selectedFolder
 	} from '$lib/stores';
 
 	import ChatMenu from './ChatMenu.svelte';
@@ -355,6 +356,13 @@
 			on:click={() => {
 				dispatch('select');
 
+				if (
+					$selectedFolder &&
+					!($selectedFolder?.items?.chats.map((chat) => chat.id) ?? []).includes(id)
+				) {
+					selectedFolder.set(null); // Reset selected folder if the chat is not in it
+				}
+
 				if ($mobile) {
 					showSidebar.set(false);
 				}