diff --git a/src/pages/MilestoneDetailPage.tsx b/src/pages/MilestoneDetailPage.tsx
index 6cbf69f..c35d6e2 100644
--- a/src/pages/MilestoneDetailPage.tsx
+++ b/src/pages/MilestoneDetailPage.tsx
@@ -84,7 +84,7 @@ export default function MilestoneDetailPage() {
   if (!milestone) return <div className="loading">Loading...</div>
 
   const renderTaskRow = (t: Task) => (
-    <tr key={t.id} className="clickable" onClick={() => navigate(`/tasks/${projectCode}/${id}/${t.id}`)}>
+    <tr key={t.id} className="clickable" onClick={() => navigate(`/milestones/${id}`)}>
       <td>{t.task_code || t.id}</td>
       <td className="issue-title">{t.title}</td>
       <td><span className={`badge status-${t.task_status || t.status}`}>{t.task_status || t.status}</span></td>
@@ -138,9 +138,9 @@ export default function MilestoneDetailPage() {
         <div style={{ display: 'flex', gap: 8, marginBottom: 16 }}>
           {!isProgressing && (
             <>
-              <button className="btn-primary" onClick={() => setShowCreateTask(true)}>+ Create Task</button>
-              <button className="btn-primary" onClick={() => setShowCreateSupport(true)}>+ Create Support</button>
-              <button className="btn-primary" onClick={() => setShowCreateMeeting(true)}>+ Schedule Meeting</button>
+              <button className="btn-primary" onClick={() => { setActiveTab("tasks"); setShowCreateTask(true) }}>+ Create Task</button>
+              <button className="btn-primary" onClick={() => { setActiveTab("supports"); setShowCreateSupport(true) }}>+ Create Support</button>
+              <button className="btn-primary" onClick={() => { setActiveTab("meetings"); setShowCreateMeeting(true) }}>+ Schedule Meeting</button>
             </>
           )}
           {isProgressing && <span className="text-dim">Milestone is in progress - cannot add new items</span>}