diff --git a/frontend/packages/swarm-ui/src/agent/terminal/SubagentsMenu.tsx b/frontend/packages/swarm-ui/src/agent/terminal/SubagentsMenu.tsx
index b120b3c6..3fc2778d 100644
--- a/frontend/packages/swarm-ui/src/agent/terminal/SubagentsMenu.tsx
+++ b/frontend/packages/swarm-ui/src/agent/terminal/SubagentsMenu.tsx
@@ -25,16 +25,19 @@ function Entry({
   agent,
   sub,
   current,
+  onPick,
 }: {
   agent: string;
   sub: Subagent;
   current: boolean;
+  onPick: () => void;
 }) {
   return (
     <li>
       <Link
         href={termPaths(agent, sub.name).page}
         class="ui-subagents-menu-link"
+        onClick={onPick}
         aria-current={current ? "page" : undefined}
       >
         <span class="ui-subagents-menu-name">{sub.name}</span>
@@ -110,6 +113,7 @@ export function SubagentsMenu({
                     agent={agentName}
                     sub={s}
                     current={s.name === current}
+                    onPick={() => setOpen(false)}
                   />
                 ))}
               </ul>
@@ -127,6 +131,7 @@ export function SubagentsMenu({
                       agent={agentName}
                       sub={s}
                       current={s.name === current}
+                      onPick={() => setOpen(false)}
                     />
                   ))}
                 </ul>
diff --git a/frontend/packages/swarm-ui/src/pages/agents/AgentTerminalPage.tsx b/frontend/packages/swarm-ui/src/pages/agents/AgentTerminalPage.tsx
index 967b487a..5d909dda 100644
--- a/frontend/packages/swarm-ui/src/pages/agents/AgentTerminalPage.tsx
+++ b/frontend/packages/swarm-ui/src/pages/agents/AgentTerminalPage.tsx
@@ -74,7 +74,7 @@ export function AgentTerminalPage({
                 onClick={() => setDetailOpen((o) => !o)}
               />
             </span>
-            <SubagentsMenu agentName={name} current={subagent} />
+            <SubagentsMenu key={name} agentName={name} current={subagent} />
           </>
         }
       />