diff --git a/ui/src/pages/AgentDetail.tsx b/ui/src/pages/AgentDetail.tsx
index ce3685fb..01d31758 100644
--- a/ui/src/pages/AgentDetail.tsx
+++ b/ui/src/pages/AgentDetail.tsx
@@ -998,6 +998,7 @@ export function AgentDetail() {
 
       {activeView === "instructions" && (
         <PromptsTab
+          key={agent.id}
           agent={agent}
           companyId={resolvedCompanyId ?? undefined}
           onDirtyChange={setConfigDirty}
@@ -1617,6 +1618,20 @@ function PromptsTab({
     selectedFile: string;
   } | null>(null);
 
+  useEffect(() => {
+    setSelectedFile("AGENTS.md");
+    setShowFilePanel(false);
+    setDraft(null);
+    setBundleDraft(null);
+    setNewFilePath("");
+    setShowNewFileInput(false);
+    setPendingFiles([]);
+    setExpandedDirs(new Set());
+    setAwaitingRefresh(false);
+    lastFileVersionRef.current = null;
+    externalBundleRef.current = null;
+  }, [agent.id]);
+
   const isLocal =
     agent.adapterType === "claude_local" ||
     agent.adapterType === "codex_local" ||