diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte
index 73ce2b33d..387654273 100644
--- a/src/lib/components/layout/Sidebar.svelte
+++ b/src/lib/components/layout/Sidebar.svelte
@@ -124,7 +124,7 @@
 
 		const onBlur = () => {
 			shiftKey = false;
-			selectedChatId = false;
+			selectedChatId = null;
 		};
 
 		window.addEventListener('keydown', onKeyDown);
@@ -477,6 +477,9 @@
 						on:select={() => {
 							selectedChatId = chat.id;
 						}}
+						on:unselect={() => {
+							selectedChatId = null;
+						}}
 						on:delete={(e) => {
 							if ((e?.detail ?? '') === 'shift') {
 								deleteChatHandler(chat.id);
diff --git a/src/lib/components/layout/Sidebar/ChatItem.svelte b/src/lib/components/layout/Sidebar/ChatItem.svelte
index 8ed0d674f..95fb4667a 100644
--- a/src/lib/components/layout/Sidebar/ChatItem.svelte
+++ b/src/lib/components/layout/Sidebar/ChatItem.svelte
@@ -231,7 +231,7 @@
 						dispatch('delete');
 					}}
 					onClose={() => {
-						selected = false;
+						dispatch('unselect');
 					}}
 				>
 					<button