diff --git a/frontend/faraday/lib/layoutAtom.ts b/frontend/faraday/lib/layoutAtom.ts
index 65e74bc0b..ecd43871f 100644
--- a/frontend/faraday/lib/layoutAtom.ts
+++ b/frontend/faraday/lib/layoutAtom.ts
@@ -32,15 +32,17 @@ export function newLayoutTreeStateAtom<T>(rootNode: LayoutNode<T>): PrimitiveAto
  */
 export function withLayoutTreeState<T>(layoutNodeAtom: WritableLayoutNodeAtom<T>): WritableLayoutTreeStateAtom<T> {
     const pendingActionAtom = atom<LayoutTreeAction>(null) as PrimitiveAtom<LayoutTreeAction>;
+    const generationAtom = atom(0) as PrimitiveAtom<number>;
     return atom(
         (get) => {
             const layoutState = newLayoutTreeState(get(layoutNodeAtom));
             layoutState.pendingAction = get(pendingActionAtom);
+            layoutState.generation = get(generationAtom);
             return layoutState;
         },
-        (_get, set, value) => {
+        (get, set, value) => {
             set(pendingActionAtom, value.pendingAction);
-            set(layoutNodeAtom, value.rootNode);
+            if (get(generationAtom) !== value.generation) set(layoutNodeAtom, value.rootNode);
         }
     );
 }
diff --git a/frontend/faraday/lib/layoutState.ts b/frontend/faraday/lib/layoutState.ts
index cbeaa52a7..95606c779 100644
--- a/frontend/faraday/lib/layoutState.ts
+++ b/frontend/faraday/lib/layoutState.ts
@@ -36,6 +36,7 @@ export function newLayoutTreeState<T>(rootNode: LayoutNode<T>): LayoutTreeState<
         rootNode: balancedRootNode,
         leafs,
         pendingAction: undefined,
+        generation: 0,
     };
 }
 
@@ -77,12 +78,15 @@ function layoutTreeStateReducerInner<T>(layoutTreeState: LayoutTreeState<T>, act
             break;
         case LayoutTreeActionType.Move:
             moveNode(layoutTreeState, action as LayoutTreeMoveNodeAction<T>);
+            layoutTreeState.generation++;
             break;
         case LayoutTreeActionType.InsertNode:
             insertNode(layoutTreeState, action as LayoutTreeInsertNodeAction<T>);
+            layoutTreeState.generation++;
             break;
         case LayoutTreeActionType.DeleteNode:
             deleteNode(layoutTreeState, action as LayoutTreeDeleteNodeAction);
+            layoutTreeState.generation++;
             break;
         default: {
             console.error("Invalid reducer action", layoutTreeState, action);
diff --git a/frontend/faraday/lib/model.ts b/frontend/faraday/lib/model.ts
index 861effba4..e56b152e7 100644
--- a/frontend/faraday/lib/model.ts
+++ b/frontend/faraday/lib/model.ts
@@ -106,6 +106,7 @@ export type LayoutTreeState<T> = {
     rootNode: LayoutNode<T>;
     leafs: LayoutNode<T>[];
     pendingAction: LayoutTreeAction;
+    generation: number;
 };
 
 /**