diff --git a/src/components/layout/ThreePanelLayout.tsx b/src/components/layout/ThreePanelLayout.tsx
index 70508ca..a715341 100644
--- a/src/components/layout/ThreePanelLayout.tsx
+++ b/src/components/layout/ThreePanelLayout.tsx
@@ -116,6 +116,22 @@ function sanitizeSlotState(state: SlotState | null, fallback: SlotState | null =
   return migrated ?? fallback;
 }
 
+function areSlotStatesEqual(a: SlotState | null, b: SlotState | null): boolean {
+  if (a === b) return true;
+  if (!a || !b) return a === b;
+  if (a.activeTabId !== b.activeTabId) return false;
+  if (a.tabs.length !== b.tabs.length) return false;
+
+  return a.tabs.every((tab, index) => {
+    const other = b.tabs[index];
+    return (
+      tab.id === other?.id &&
+      tab.type === other?.type &&
+      tab.nodeId === other?.nodeId
+    );
+  });
+}
+
 function getSlotTabsByType(state: SlotState | null, type: PaneType): SlotTab[] {
   return state?.tabs.filter((tab) => tab.type === type) ?? [];
 }
@@ -167,9 +183,18 @@ export default function ThreePanelLayout() {
   }, []);
 
   useEffect(() => {
-    setSlotA((prev) => sanitizeSlotState(prev, DEFAULT_SLOT_A));
-    setSlotB((prev) => sanitizeSlotState(prev));
-    setSlotC((prev) => sanitizeSlotState(prev));
+    setSlotA((prev) => {
+      const next = sanitizeSlotState(prev, DEFAULT_SLOT_A);
+      return areSlotStatesEqual(prev, next) ? prev : next;
+    });
+    setSlotB((prev) => {
+      const next = sanitizeSlotState(prev);
+      return areSlotStatesEqual(prev, next) ? prev : next;
+    });
+    setSlotC((prev) => {
+      const next = sanitizeSlotState(prev);
+      return areSlotStatesEqual(prev, next) ? prev : next;
+    });
   }, [setSlotA, setSlotB, setSlotC]);
 
   useEffect(() => {
diff --git a/src/hooks/usePersistentState.ts b/src/hooks/usePersistentState.ts
index 7efb707..d5d7d70 100644
--- a/src/hooks/usePersistentState.ts
+++ b/src/hooks/usePersistentState.ts
@@ -1,6 +1,6 @@
 "use client";
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
 
 export function usePersistentState<T>(
   key: string,
@@ -22,7 +22,7 @@ export function usePersistentState<T>(
   }, [key]);
   
   // Save to localStorage when state changes
-  const setPersistentState = (value: T | ((prev: T) => T)) => {
+  const setPersistentState = useCallback((value: T | ((prev: T) => T)) => {
     setState(prev => {
       const newValue = typeof value === 'function' 
         ? (value as (prev: T) => T)(prev)
@@ -36,7 +36,7 @@ export function usePersistentState<T>(
       
       return newValue;
     });
-  };
+  }, [key]);
   
   return [state, setPersistentState];
-}
\ No newline at end of file
+}