diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte
index 0c8d0da1be..d547779482 100644
--- a/src/lib/components/layout/Sidebar.svelte
+++ b/src/lib/components/layout/Sidebar.svelte
@@ -93,7 +93,7 @@
 			folders[folder.id] = { ...(folders[folder.id] || {}), ...folder };
 
 			if (newFolderId && folder.id === newFolderId) {
-				folders[folder.id].isNew = true;
+				folders[folder.id].new = true;
 				newFolderId = null;
 			}
 		}
diff --git a/src/lib/components/layout/Sidebar/RecursiveFolder.svelte b/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
index 334eb80bfa..0940475d90 100644
--- a/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
+++ b/src/lib/components/layout/Sidebar/RecursiveFolder.svelte
@@ -201,7 +201,7 @@
 		dragged = false;
 	};
 
-	onMount(() => {
+	onMount(async () => {
 		open = folders[folderId].is_expanded;
 		if (folderElement) {
 			folderElement.addEventListener('dragover', onDragOver);
@@ -216,12 +216,11 @@
 			folderElement.addEventListener('dragend', onDragEnd);
 		}
 
-		if (folders[folderId].isNew) {
-			folders[folderId].isNew = false;
-			
-			setTimeout(() => {
-				editHandler();
-			}, 100);
+		if (folders[folderId]?.new) {
+			delete folders[folderId].new;
+
+			await tick();
+			editHandler();
 		}
 	});