diff --git a/packages/vscode-ide-companion/src/webview/App.tsx b/packages/vscode-ide-companion/src/webview/App.tsx
index 1b2bec3d..1df61679 100644
--- a/packages/vscode-ide-companion/src/webview/App.tsx
+++ b/packages/vscode-ide-companion/src/webview/App.tsx
@@ -624,6 +624,7 @@ export const App: React.FC = () => {
         inputText={inputText}
         inputFieldRef={inputFieldRef}
         isStreaming={messageHandling.isStreaming}
+        isWaitingForResponse={messageHandling.isWaitingForResponse}
         isComposing={isComposing}
         editMode={editMode}
         thinkingEnabled={thinkingEnabled}
diff --git a/packages/vscode-ide-companion/src/webview/components/InputForm.tsx b/packages/vscode-ide-companion/src/webview/components/InputForm.tsx
index 16abca3f..3e9b1950 100644
--- a/packages/vscode-ide-companion/src/webview/components/InputForm.tsx
+++ b/packages/vscode-ide-companion/src/webview/components/InputForm.tsx
@@ -27,6 +27,7 @@ interface InputFormProps {
   // generic should be `HTMLDivElement` (not `HTMLDivElement | null`).
   inputFieldRef: React.RefObject<HTMLDivElement>;
   isStreaming: boolean;
+  isWaitingForResponse: boolean;
   isComposing: boolean;
   editMode: EditMode;
   thinkingEnabled: boolean;
@@ -235,7 +236,7 @@ export const InputForm: React.FC<InputFormProps> = ({
             </button>
 
             {/* Send/Stop button */}
-            {isStreaming ? (
+            {isStreaming || isWaitingForResponse ? (
               <button
                 type="button"
                 className="btn-send-compact [&>svg]:w-5 [&>svg]:h-5"