diff --git a/components/chat.tsx b/components/chat.tsx
index d50e312..73779cb 100644
--- a/components/chat.tsx
+++ b/components/chat.tsx
@@ -399,14 +399,15 @@ export function Chat({
 					</ConversationContent>
 					<ConversationScrollButton />
 				</Conversation>
-				{/* Right sidebar: the live sub-agent fleet (when running) above
-				    the plan tree — the fleet panel renders nothing while idle. */}
-				<div className="hidden shrink-0 flex-col xl:flex">
-					<SubAgentsPanel jobs={jobs} />
-					<TreePanel messages={messages} />
-				</div>
 				</div>
 			</div>
+			{/* Right sidebar, a full-height sibling of the middle column: the
+			    live sub-agent fleet (when running) above the plan tree — the
+			    fleet panel renders nothing while idle, so the column is all plan. */}
+			<div className="hidden shrink-0 flex-col xl:flex">
+				<SubAgentsPanel jobs={jobs} />
+				<TreePanel messages={messages} />
+			</div>
 		</div>
 		</JobsContext.Provider>
 		</ChatActionsContext.Provider>
diff --git a/components/tree-panel.tsx b/components/tree-panel.tsx
index fe2ee86..30c374a 100644
--- a/components/tree-panel.tsx
+++ b/components/tree-panel.tsx
@@ -236,7 +236,7 @@ export function TreePanel({
 		<aside
 			data-testid="tree-panel"
 			className={cn(
-				"sidebar-motion hidden shrink-0 overflow-hidden border-l border-border/60 bg-card/30 duration-200 xl:flex",
+				"sidebar-motion hidden min-h-0 flex-1 shrink-0 overflow-hidden border-l border-border/60 bg-card/30 duration-200 xl:flex",
 				PANEL_WIDTH[mode],
 			)}
 		>