diff --git a/frontend/layout/lib/layoutModel.ts b/frontend/layout/lib/layoutModel.ts
index 447ab0e3..6edb233a 100644
--- a/frontend/layout/lib/layoutModel.ts
+++ b/frontend/layout/lib/layoutModel.ts
@@ -267,6 +267,9 @@ export class LayoutModel {
 
         this.focusedNode = atom((get) => {
             const treeState = get(this.treeStateAtom);
+            if (treeState.focusedNodeId == null) {
+                return null;
+            }
             return findNode(treeState.rootNode, treeState.focusedNodeId);
         });
         this.focusedNodeIdStack = [];