diff --git a/frontend/faraday/lib/layoutAtom.ts b/frontend/faraday/lib/layoutAtom.ts
index ecd43871f..110edfe6e 100644
--- a/frontend/faraday/lib/layoutAtom.ts
+++ b/frontend/faraday/lib/layoutAtom.ts
@@ -42,7 +42,10 @@ export function withLayoutTreeState<T>(layoutNodeAtom: WritableLayoutNodeAtom<T>
         },
         (get, set, value) => {
             set(pendingActionAtom, value.pendingAction);
-            if (get(generationAtom) !== value.generation) set(layoutNodeAtom, value.rootNode);
+            if (get(generationAtom) !== value.generation) {
+                set(generationAtom, value.generation);
+                set(layoutNodeAtom, value.rootNode);
+            }
         }
     );
 }