diff --git a/src/lib/components/layout/Sidebar/ChatItem.svelte b/src/lib/components/layout/Sidebar/ChatItem.svelte
index 4b6cf6b2fd..675082cf4c 100644
--- a/src/lib/components/layout/Sidebar/ChatItem.svelte
+++ b/src/lib/components/layout/Sidebar/ChatItem.svelte
@@ -673,7 +673,7 @@
 					}}
 				>
 					<LinkPreview.Trigger
-						class="flex min-w-0 flex-1 items-center"
+						class="flex min-w-0 flex-1 -my-1.5 py-1.5 items-center"
 						href="/c/{id}"
 						aria-current={id === $chatId ? 'page' : undefined}
 						onclick={selectChatHandler}
diff --git a/src/lib/components/layout/Sidebar/RecursiveFolder.svelte b/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
index c54f1e9101..4020d72f60 100644
--- a/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
+++ b/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
@@ -1,3 +1,7 @@
+<script context="module">
+	let closeActiveHoverPreview = null;
+</script>
+
 <script>
 	import { getContext, createEventDispatcher, onMount, onDestroy, tick } from 'svelte';
 
@@ -92,6 +96,17 @@
 		openPreview = false;
 	}
 
+	const closeHoverPreview = () => {
+		if (openPreview) {
+			openPreview = false;
+		}
+	};
+
+	$: if (openPreview && closeActiveHoverPreview !== closeHoverPreview) {
+		closeActiveHoverPreview?.();
+		closeActiveHoverPreview = closeHoverPreview;
+	}
+
 	let name = '';
 
 	const formatUnreadCount = (count) =>
@@ -445,6 +460,10 @@
 	onDestroy(() => {
 		delete folderRegistry[folderId];
 
+		if (closeActiveHoverPreview === closeHoverPreview) {
+			closeActiveHoverPreview = null;
+		}
+
 		if (folderElement) {
 			folderElement.removeEventListener('dragover', onDragOver);
 			folderElement.removeEventListener('drop', onDrop);
@@ -800,7 +819,9 @@
 					{/if}
 				</button>
 
-				<div class="translate-y-[0.5px] flex min-w-0 flex-1 items-center gap-1.5 pr-6 text-start">
+				<div
+					class="translate-y-[0.5px] flex min-w-0 flex-1 self-stretch items-center gap-1.5 pr-6 text-start"
+				>
 					{#if edit}
 						<input
 							id="folder-{folderId}-input"
@@ -836,7 +857,7 @@
 							<LinkPreview.Trigger
 								href={`/folders/${folderId}`}
 								draggable="false"
-								class="flex min-w-0 flex-1 items-center gap-1.5"
+								class="flex min-w-0 flex-1 self-stretch -my-1 items-center gap-1.5"
 								ondblclick={(e) => {
 									if (!isWritable || e.ctrlKey || e.metaKey || e.shiftKey || e.altKey) return;
 									if (clickTimer) {