diff --git a/desktop/src/features/channels/ui/BotActivityBar.tsx b/desktop/src/features/channels/ui/BotActivityBar.tsx
index d9139935f6..4d6613d927 100644
--- a/desktop/src/features/channels/ui/BotActivityBar.tsx
+++ b/desktop/src/features/channels/ui/BotActivityBar.tsx
@@ -197,8 +197,16 @@ export function BotActivityComposerAction({
               +{typingAgents.length - 2}
             </span>
           ) : null}
-          <span className={cn(isInline ? "max-w-40 truncate" : "sr-only")}>
-            {isInline ? <Shimmer>{visibleStatusLabel}</Shimmer> : "working"}
+          <span
+            className={cn(
+              isInline ? "min-w-0 flex-1 overflow-hidden" : "sr-only",
+            )}
+          >
+            {isInline ? (
+              <Shimmer className="block truncate">{visibleStatusLabel}</Shimmer>
+            ) : (
+              "working"
+            )}
           </span>
           {isInline ? null : (
             <Loader2 className="h-4 w-4 shrink-0 animate-spin opacity-70" />
diff --git a/desktop/src/features/channels/ui/ChannelPane.tsx b/desktop/src/features/channels/ui/ChannelPane.tsx
index 556180830b..f89245e535 100644
--- a/desktop/src/features/channels/ui/ChannelPane.tsx
+++ b/desktop/src/features/channels/ui/ChannelPane.tsx
@@ -686,10 +686,10 @@ export const ChannelPane = React.memo(function ChannelPane({
                   }
                   showTopBorder={false}
                 />
-                <div className="h-7 overflow-visible bg-background px-5 pb-1 pt-0">
+                <div className="min-h-8 overflow-visible bg-background px-5 pb-1.5 pt-0">
                   <div className="flex h-full w-full items-center gap-2 overflow-visible">
                     {hasComposerBotActivity ? (
-                      <div className="shrink-0 overflow-visible">
+                      <div className="flex min-w-0 flex-1 overflow-visible">
                         <BotActivityComposerAction
                           agents={activityAgents}
                           channelId={activeChannel?.id ?? null}
diff --git a/desktop/src/features/messages/ui/MessageThreadPanel.tsx b/desktop/src/features/messages/ui/MessageThreadPanel.tsx
index 7060694ea3..27732af282 100644
--- a/desktop/src/features/messages/ui/MessageThreadPanel.tsx
+++ b/desktop/src/features/messages/ui/MessageThreadPanel.tsx
@@ -832,13 +832,15 @@ export function MessageThreadPanel({
           />
           <div
             className={cn(
-              "h-7 bg-background pb-1 pt-0",
+              "min-h-8 bg-background pb-1.5 pt-0",
               THREAD_PANEL_COMPOSER_GUTTER_CLASS,
             )}
           >
-            <div className="mx-auto flex h-full w-full max-w-4xl items-center gap-2">
+            <div className="mx-auto flex h-full w-full max-w-4xl items-center gap-2 overflow-visible">
               {toolbarExtraActions ? (
-                <div className="shrink-0">{toolbarExtraActions}</div>
+                <div className="flex min-w-0 flex-1 overflow-visible">
+                  {toolbarExtraActions}
+                </div>
               ) : null}
               {threadTypingPubkeys.length > 0 ? (
                 <TypingIndicatorRow