diff --git a/packages/core/src/amazonq/webview/ui/tabs/generator.ts b/packages/core/src/amazonq/webview/ui/tabs/generator.ts
index 6f887f5817b..15f00e9baeb 100644
--- a/packages/core/src/amazonq/webview/ui/tabs/generator.ts
+++ b/packages/core/src/amazonq/webview/ui/tabs/generator.ts
@@ -72,23 +72,26 @@ export class TabDataGenerator {
                       },
                   ]
                 : [],
-            promptInputOptions: [
-                {
-                    type: 'toggle',
-                    id: 'prompt-type',
-                    value: 'ask',
-                    options: [
-                        {
-                            value: 'pair-programming-on',
-                            icon: 'code-block', // TODO: correct icons
-                        },
-                        {
-                            value: 'pair-programming-off',
-                            icon: 'chat', // TODO: correct icons
-                        },
-                    ],
-                },
-            ],
+            promptInputOptions:
+                tabType === 'cwc'
+                    ? [
+                          {
+                              type: 'toggle',
+                              id: 'prompt-type',
+                              value: 'ask',
+                              options: [
+                                  {
+                                      value: 'pair-programming-on',
+                                      icon: 'code-block', // TODO: correct icons
+                                  },
+                                  {
+                                      value: 'pair-programming-off',
+                                      icon: 'chat', // TODO: correct icons
+                                  },
+                              ],
+                          },
+                      ]
+                    : [],
         }
         return tabData
     }
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
index ae245180124..bdaf4892e7b 100644
--- a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
+++ b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -284,9 +284,7 @@ export class Messenger {
                         } else {
                             // TODO: Handle the error
                         }
-                    } else if (cwChatEvent.toolUseEvent?.stop === undefined && toolUseInput !== '') {
-                        // This is for the case when writing tool is executed. The toolUseEvent is non stop but in toolUseInput is not empty. In this case we need show user the current spinner UI.
-                        this.sendInitalStream(tabID, triggerID, undefined)
+                        // TODO: Add a spinner component for fsWrite, previous implementation is causing lag in mynah UX.
                     }
 
                     if (