@@ -30,6 +30,7 @@ import { joinHostPath } from "./filePath";
 import { createFileTreeDragMentionController } from "./fileTreeDragMention";
 import {
   areAllDirectoriesExpanded,
+  coalesceReentrantCalls,
   readExpandedDirectories,
   setAllDirectoriesExpanded,
   writeExpandedDirectories,
@@ -358,7 +359,8 @@ export default function FileBrowserPanel({
     for (const path of expandedPathsRef.current) {
       if (!currentPaths.has(path)) expandedPathsRef.current.delete(path);
     }
-    const loadExpanded = () => {
+    // Restoring calls item.expand(), which notifies subscribers synchronously.
+    const loadExpanded = coalesceReentrantCalls(() => {
       if (model.isSearchOpen()) return;
       let changed = false;
       for (const path of directoryPaths) {
@@ -383,7 +385,7 @@ export default function FileBrowserPanel({
           ...pendingExpandedPaths,
         ]);
       }
-    };
+    });
     loadExpanded();
     return model.subscribe(loadExpanded);
   }, [directoryPaths, expansionRoot, load, model, pendingExpandedPaths]);
 
@@ -58,6 +58,27 @@ export function setAllDirectoriesExpanded(
   }
 }
 
+/** Calls made while `run` is running rerun it once it returns, instead of nesting. */
+export function coalesceReentrantCalls(run: () => void): () => void {
+  let running = false;
+  let calledAgain = false;
+  return () => {
+    if (running) {
+      calledAgain = true;
+      return;
+    }
+    running = true;
+    try {
+      do {
+        calledAgain = false;
+        run();
+      } while (calledAgain);
+    } finally {
+      running = false;
+    }
+  };
+}
+
 const EXPANDED_DIRECTORIES_STORAGE_KEY = "t3code.fileTreeExpandedDirectories";
 // Roots are kept most recent first and capped so worktrees that come and go do not grow storage.
 const MAX_STORED_ROOTS = 20;