1 files changed, 6 insertions, 0 deletions
diff --git a/makima/frontend/src/components/directives/DirectiveDetail.tsx b/makima/frontend/src/components/directives/DirectiveDetail.tsx
index 369cdaa..491307b 100644
--- a/makima/frontend/src/components/directives/DirectiveDetail.tsx
+++ b/makima/frontend/src/components/directives/DirectiveDetail.tsx
@@ -60,6 +60,12 @@ export function DirectiveDetail({
   const prevHadRunningRef = useRef(false);
   const badge = STATUS_BADGE[directive.status] || STATUS_BADGE.draft;
 
+  // Sync goalText when directive changes (fixes stale state when switching directives)
+  useEffect(() => {
+    setGoalText(directive.goal);
+    setEditingGoal(false);
+  }, [directive.id, directive.goal]);
+
   const completedSteps = directive.steps.filter((s) => s.status === "completed").length;
   const totalSteps = directive.steps.length;
   const progress = totalSteps > 0 ? Math.round((completedSteps / totalSteps) * 100) : 0;