diff --git a/HellionChat/Ui/Components/Sidebar.cs b/HellionChat/Ui/Components/Sidebar.cs
index 3bacbee..9228044 100644
--- a/HellionChat/Ui/Components/Sidebar.cs
+++ b/HellionChat/Ui/Components/Sidebar.cs
@@ -248,7 +248,11 @@ internal sealed class Sidebar
         // Only split off a separate pop-out hit area when there's room for
         // both buttons. Below that, the whole row stays as a single
         // selectable strip without the pop-out affordance.
-        var hasPopOut = avail > PopOutHitWidth + 4f;
+        // A3: gate the pop-out affordance on the expanded sidebar too. In
+        // icon-only mode avail still clears the width threshold, which used to
+        // paint the pop-out glyph over the tab icon. The row stays a single
+        // selectable strip when collapsed; right-click pop-out is unaffected.
+        var hasPopOut = expanded && avail > PopOutHitWidth + 4f;
         var tabHitWidth = hasPopOut ? avail - PopOutHitWidth : avail;
         if (showGreeted)
         {