diff --git a/src/ClaudeCodeVS/Ui/ClaudeToolWindowControl.cs b/src/ClaudeCodeVS/Ui/ClaudeToolWindowControl.cs
index aef43a7..95029dc 100644
--- a/src/ClaudeCodeVS/Ui/ClaudeToolWindowControl.cs
+++ b/src/ClaudeCodeVS/Ui/ClaudeToolWindowControl.cs
@@ -253,7 +253,11 @@ public ClaudeToolWindowControl()
             Opacity = 0.75,
             VerticalAlignment = VerticalAlignment.Center,
         }, 0.96);
-        var attachHeader = new StackPanel { Orientation = Orientation.Horizontal };
+        // WrapPanel, not a horizontal StackPanel, for the same reason as the toolbar above: at a docked
+        // panel width the hint plus Paste/Compose/Clear overflow, and a StackPanel just runs off the edge
+        // (the card grew a horizontal scrollbar and Compose sat half outside it). Wrapping keeps each
+        // button whole and clickable at any width.
+        var attachHeader = new WrapPanel();
         attachHeader.Children.Add(attachHint);
         var pasteBtn = MakeButton(Strings.BtnPaste, PasteFromClipboard);
         pasteBtn.Margin = new Thickness(6, 0, 6, 0);