diff --git a/src/stores/useModelStore.ts b/src/stores/useModelStore.ts
index 5589f7f..8eeae17 100644
--- a/src/stores/useModelStore.ts
+++ b/src/stores/useModelStore.ts
@@ -348,7 +348,16 @@ export const useModelStore = create<ModelStore>((set, get) => ({
 
   setActiveModel: (id) => {
     const state = get();
-    set({ activeModelId: id, ...syncActive({ models: state.models, activeModelId: id }) });
+    const active = state.models.find(m => m.id === id);
+    const vis = active ? loadVisibility(active.fileName) : { hidden: new Set<string>(), isolated: null };
+    set({
+      activeModelId: id,
+      ...syncActive({ models: state.models, activeModelId: id }),
+      hiddenElementKeys: vis.hidden,
+      isolatedElementKeys: vis.isolated,
+      selectedElementKeys: new Set(),
+      visibilityNonce: state.visibilityNonce + 1,
+    });
   },
 
   toggleModelVisible: (id) => set((state) => ({