diff --git a/crates/agent_ui/src/acp/thread_view/active_thread.rs b/crates/agent_ui/src/acp/thread_view/active_thread.rs
index 7dd0101f624f92f698b92df0a6842acd2fe48f4b..2630d3ffd6c41891c0b56501fb36a027f141aa91 100644
--- a/crates/agent_ui/src/acp/thread_view/active_thread.rs
+++ b/crates/agent_ui/src/acp/thread_view/active_thread.rs
@@ -6104,9 +6104,16 @@ impl AcpThreadView {
                     .bg(self.tool_card_header_bg(cx))
                     .child(
                         h_flex()
+                            .id(format!("subagent-title-{}-{}", entry_ix, context_ix))
+                            .min_w_0()
+                            .overflow_hidden()
                             .gap_1p5()
                             .child(icon)
-                            .child(Label::new(title.to_string()).size(LabelSize::Small))
+                            .child(
+                                Label::new(title.to_string())
+                                    .size(LabelSize::Small)
+                                    .truncate(),
+                            )
                             .when(files_changed > 0, |this| {
                                 this.child(
                                     h_flex()
@@ -6126,11 +6133,13 @@ impl AcpThreadView {
                                             diff_stats.lines_removed as usize,
                                         )),
                                 )
-                            }),
+                            })
+                            .tooltip(Tooltip::text(title.to_string())),
                     )
                     .when_some(session_id, |this, session_id| {
                         this.child(
                             h_flex()
+                                .flex_shrink_0()
                                 .when(has_expandable_content, |this| {
                                     this.child(
                                         IconButton::new(