diff --git a/frontend/layout/lib/layoutModel.ts b/frontend/layout/lib/layoutModel.ts
index 018bf1d6..e3715f7a 100644
--- a/frontend/layout/lib/layoutModel.ts
+++ b/frontend/layout/lib/layoutModel.ts
@@ -732,7 +732,6 @@ export class LayoutModel {
                 nodeId: nodeid,
                 blockId,
                 blockNum: atom((get) => get(this.leafOrder).indexOf(nodeid) + 1),
-                isResizing: this.isResizing,
                 isFocused: atom((get) => {
                     const treeState = get(this.treeStateAtom);
                     const isFocused = treeState.focusedNodeId === nodeid;
@@ -748,6 +747,7 @@ export class LayoutModel {
                 toggleMagnify: () => this.magnifyNodeToggle(nodeid),
                 focusNode: () => this.focusNode(nodeid),
                 dragHandleRef: createRef(),
+                displayContainerRef: this.displayContainerRef,
             });
         }
         const nodeModel = this.nodeModels.get(nodeid);
diff --git a/frontend/layout/lib/layoutModelHooks.ts b/frontend/layout/lib/layoutModelHooks.ts
index 657f4881..2025675d 100644
--- a/frontend/layout/lib/layoutModelHooks.ts
+++ b/frontend/layout/lib/layoutModelHooks.ts
@@ -5,7 +5,7 @@ import { atoms, globalStore, WOS } from "@/app/store/global";
 import { fireAndForget } from "@/util/util";
 import useResizeObserver from "@react-hook/resize-observer";
 import { Atom, useAtomValue } from "jotai";
-import { CSSProperties, useEffect, useState } from "react";
+import { CSSProperties, useEffect, useLayoutEffect, useState } from "react";
 import { withLayoutTreeStateAtomFromTab } from "./layoutAtom";
 import { LayoutModel } from "./layoutModel";
 import { LayoutNode, NodeModel, TileLayoutContents } from "./types";
@@ -63,26 +63,32 @@ export function useNodeModel(layoutModel: LayoutModel, layoutNode: LayoutNode):
 
 export function useDebouncedNodeInnerRect(nodeModel: NodeModel): CSSProperties {
     const nodeInnerRect = useAtomValue(nodeModel.innerRect);
-    const nodeIsResizing = useAtomValue(nodeModel.isResizing);
-
-    const [debounceTimeout, setDebounceTimeout] = useState<NodeJS.Timeout>();
     const [innerRect, setInnerRect] = useState<CSSProperties>();
+    const [isTransitioning, setIsTransitioning] = useState(false);
 
     useEffect(() => {
-        if (!nodeIsResizing && nodeInnerRect) {
-            if (debounceTimeout) {
-                clearTimeout(debounceTimeout);
-            }
-            setDebounceTimeout(
-                setTimeout(() => {
-                    setInnerRect(nodeInnerRect);
-                    setDebounceTimeout(null);
-                }, nodeModel.animationTimeS * 1000)
-            );
-        } else {
-            setInnerRect(null);
+        const onTransitionStart = () => {
+            setIsTransitioning(true);
+        };
+        const onTransitionEnd = () => {
+            setIsTransitioning(false);
+        };
+        if (nodeModel.displayContainerRef.current) {
+            nodeModel.displayContainerRef.current.addEventListener("transitionstart", onTransitionStart);
+            nodeModel.displayContainerRef.current.addEventListener("transitionend", onTransitionEnd);
         }
-    }, [nodeInnerRect, nodeIsResizing]);
+
+        return () => {
+            nodeModel.displayContainerRef.current?.removeEventListener("transitionstart", onTransitionStart);
+            nodeModel.displayContainerRef.current?.removeEventListener("transitionend", onTransitionEnd);
+        };
+    }, [nodeModel]);
+
+    useLayoutEffect(() => {
+        if (!isTransitioning) {
+            setInnerRect(nodeInnerRect);
+        }
+    }, [nodeInnerRect, isTransitioning]);
 
     return innerRect;
 }
diff --git a/frontend/layout/lib/types.ts b/frontend/layout/lib/types.ts
index e9ea9c13..8aa10d3c 100644
--- a/frontend/layout/lib/types.ts
+++ b/frontend/layout/lib/types.ts
@@ -330,7 +330,6 @@ export interface NodeModel {
     blockNum: Atom<number>;
     nodeId: string;
     blockId: string;
-    isResizing: Atom<boolean>;
     isFocused: Atom<boolean>;
     isMagnified: Atom<boolean>;
     ready: Atom<boolean>;
@@ -339,4 +338,5 @@ export interface NodeModel {
     focusNode: () => void;
     onClose: () => void;
     dragHandleRef?: React.RefObject<HTMLDivElement>;
+    displayContainerRef: React.RefObject<HTMLDivElement>;
 }