diff --git a/frontend/src/lib/components/FolderPicker.svelte b/frontend/src/lib/components/FolderPicker.svelte
index dd7f623813..d761da297b 100644
--- a/frontend/src/lib/components/FolderPicker.svelte
+++ b/frontend/src/lib/components/FolderPicker.svelte
@@ -65,7 +65,7 @@
 	loadFolders()
 </script>
 
-<Drawer bind:this={newFolder}>
+<Drawer bind:this={newFolder} name="newFolder">
 	<DrawerContent
 		title="New Folder"
 		on:close={() => {
diff --git a/frontend/src/lib/components/common/drawer/Disposable.svelte b/frontend/src/lib/components/common/drawer/Disposable.svelte
index 01e23ba8be..439352749d 100644
--- a/frontend/src/lib/components/common/drawer/Disposable.svelte
+++ b/frontend/src/lib/components/common/drawer/Disposable.svelte
@@ -43,8 +43,8 @@
 			if (openedDrawers.val.includes(id)) {
 				return
 			}
-			offset = openedDrawers.val.length - 1
 			openedDrawers.val.push(id)
+			offset = initialOffset + openedDrawers.val.length
 		}
 	}
 
@@ -92,6 +92,7 @@
 
 	if (open) {
 		openedDrawers.val.push(id)
+		offset = initialOffset + openedDrawers.val.length
 	}
 
 	let wasEverOpen = false
diff --git a/frontend/src/lib/components/common/drawer/Drawer.svelte b/frontend/src/lib/components/common/drawer/Drawer.svelte
index d9fa646e7a..24668fdd3f 100644
--- a/frontend/src/lib/components/common/drawer/Drawer.svelte
+++ b/frontend/src/lib/components/common/drawer/Drawer.svelte
@@ -17,6 +17,7 @@
 		disableChatOffset?: boolean
 		class?: string | undefined
 		positionClass?: string | undefined
+		name?: string
 		children?: import('svelte').Snippet<[any]>
 	}
 
@@ -32,6 +33,7 @@
 		disableChatOffset = false,
 		class: clazz = '',
 		positionClass = undefined,
+		name = undefined,
 		children: children_render
 	}: Props = $props()
 
@@ -85,6 +87,7 @@
 
 	$effect(() => {
 		open
+		console.log('open', open)
 		untrack(() => {
 			open ? openDrawer() : closeDrawer()
 		})
@@ -112,9 +115,8 @@
 	>
 		{#snippet children({ handleClickAway, zIndex, isTop })}
 			<aside
-				class="drawer windmill-app windmill-drawer {clazz ?? ''} {positionClass ?? ''} {aiChatOpen
-					? 'respect-global-chat'
-					: ''}"
+				class="drawer windmill-app windmill-drawer {name ? `windmill-drawer-${name}` : ''} {clazz ??
+					''} {positionClass ?? ''} {aiChatOpen ? 'respect-global-chat' : ''}"
 				class:open
 				class:close={!open && timeout}
 				class:global-chat-open={aiChatOpen}