diff --git a/client/src/components/Chat/Input/ChatForm.tsx b/client/src/components/Chat/Input/ChatForm.tsx
index 8e601f7adf..8c56e0371e 100644
--- a/client/src/components/Chat/Input/ChatForm.tsx
+++ b/client/src/components/Chat/Input/ChatForm.tsx
@@ -413,7 +413,9 @@ const ChatForm = memo(function ChatForm({
         {/* Primary composer owns the selection popup so split-view doesn't double it. */}
         {index === 0 && quotesEnabled && <QuoteButton conversationId={conversationId} />}
         <div className="flex w-full flex-col">
-          {steering.enabled && <InFlightSteers conversationId={conversationId} />}
+          {/* Run-scoped: `enabled` alone is any primary composer on a steerable
+              endpoint, so a chip that outlives the run would strand a bubble. */}
+          {steering.enabled && isSubmitting && <InFlightSteers conversationId={conversationId} />}
           <div className={cn('flex w-full items-center', isRTL && 'flex-row-reverse')}>
             <Mention
               index={index}
diff --git a/client/src/components/Chat/Input/InFlightSteers.tsx b/client/src/components/Chat/Input/InFlightSteers.tsx
index 98ede47921..eefd4610a7 100644
--- a/client/src/components/Chat/Input/InFlightSteers.tsx
+++ b/client/src/components/Chat/Input/InFlightSteers.tsx
@@ -103,7 +103,13 @@ const InFlightSteer = memo(function InFlightSteer({
               !enableUserMsgMarkdown && 'whitespace-pre-wrap',
             )}
           >
-            {enableUserMsgMarkdown ? <MarkdownLite content={steer.text} /> : steer.text}
+            {/* No code execution: this bubble sits outside MessageContext, so
+             *  Run Code would fire with no message/part to target. */}
+            {enableUserMsgMarkdown ? (
+              <MarkdownLite content={steer.text} codeExecution={false} />
+            ) : (
+              steer.text
+            )}
           </div>
         </div>
         {!sending && (
@@ -159,7 +165,10 @@ const InFlightSteers = memo(function InFlightSteers({
       role="list"
       aria-label={localize('com_ui_steer_in_flight')}
       data-testid="in-flight-steers"
-      className="flex flex-col items-start gap-2 px-2 pb-2"
+      /* Capped: a steer runs to 16k chars and a run takes up to 10 of them.
+       * Unbounded, the stack would push the composer off-screen — the old
+       * in-thread slot could grow freely because it scrolled with the thread. */
+      className="flex max-h-[35vh] flex-col items-start gap-2 overflow-y-auto px-2 pb-2"
     >
       {inFlight.map((steer) => (
         <InFlightSteer key={steer.steerId} steer={steer} conversationId={conversationId} />
diff --git a/client/src/components/Chat/Input/__tests__/InFlightSteers.test.tsx b/client/src/components/Chat/Input/__tests__/InFlightSteers.test.tsx
index 59a2c68e6c..da2193d0d7 100644
--- a/client/src/components/Chat/Input/__tests__/InFlightSteers.test.tsx
+++ b/client/src/components/Chat/Input/__tests__/InFlightSteers.test.tsx
@@ -42,8 +42,10 @@ jest.mock('~/components/Chat/Messages/Content/FilePreviewDialog', () => ({
 
 jest.mock('~/components/Chat/Messages/Content/MarkdownLite', () => ({
   __esModule: true,
-  default: ({ content }: { content: string }) => (
-    <span data-testid="steer-markdown">{content}</span>
+  default: ({ content, codeExecution }: { content: string; codeExecution?: boolean }) => (
+    <span data-testid="steer-markdown" data-code-execution={String(codeExecution)}>
+      {content}
+    </span>
   ),
 }));
 
@@ -193,6 +195,23 @@ describe('InFlightSteers', () => {
     expect(screen.getByTestId('steer-markdown')).toHaveTextContent('**bold** steer');
   });
 
+  it('disables code execution: the bubble has no message/part for Run Code to target', () => {
+    renderSteers([{ steerId: 's1', text: '```js\nrun()\n```', status: 'pending', createdAt: 1 }], {
+      enableUserMsgMarkdown: true,
+    });
+    // This component renders outside MessageContext, so an executable code
+    // block would fire the tool mutation with no messageId/conversationId.
+    expect(screen.getByTestId('steer-markdown')).toHaveAttribute('data-code-execution', 'false');
+  });
+
+  it('caps the stack so a long steer cannot push the composer off-screen', () => {
+    renderSteers([{ steerId: 's1', text: 'x'.repeat(4000), status: 'pending', createdAt: 1 }]);
+    // A steer runs to 16k chars, and a run takes up to 10 of them.
+    const stack = screen.getByTestId('in-flight-steers');
+    expect(stack.className).toContain('max-h-[35vh]');
+    expect(stack.className).toContain('overflow-y-auto');
+  });
+
   it('renders raw text when user-message markdown is off', () => {
     renderSteers([{ steerId: 's1', text: '**bold** steer', status: 'pending', createdAt: 1 }], {
       enableUserMsgMarkdown: false,