diff --git a/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts b/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
index ed159f6e44b..1ac2efd8cbb 100644
--- a/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
+++ b/packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
@@ -345,12 +345,22 @@ export class Connector extends BaseConnector {
                 }
                 break
             case 'run-shell-command':
-                if (answer.header) {
-                    answer.header.status = {
+                if (Object.keys(answer.header!).length === 0) {
+                    answer.header = {
+                        body: '$ shell',
+                        status: {
+                            icon: 'ok' as MynahIconsType,
+                            text: 'Accepted',
+                            status: 'success',
+                        },
+                    }
+                } else {
+                    answer.header!.status = {
                         icon: 'ok' as MynahIconsType,
                         text: 'Accepted',
                         status: 'success',
                     }
+                    answer.header!.buttons = []
                 }
                 break
             case 'reject-shell-command':
@@ -360,6 +370,7 @@ export class Connector extends BaseConnector {
                         text: 'Rejected',
                         status: 'error',
                     }
+                    answer.header.buttons = []
                 }
                 break
             default:
diff --git a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
index e4e6619e264..7560895ac23 100644
--- a/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
+++ b/packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
@@ -475,13 +475,12 @@ export class Messenger {
             }
 
             shellCommandHeader = {
-                icon: 'code-block' as MynahIconsType,
-                body: 'shell',
+                body: '$ shell',
                 buttons: buttons,
             }
 
             if (validation.warning) {
-                message = validation.warning + message
+                message = validation.warning + message + '\nRun the command to proceed.\n'
             }
         } else if (toolUse?.name === ToolType.FsWrite) {
             const input = toolUse.input as unknown as FsWriteParams