diff --git a/packages/amazonq/.changes/next-release/Bug Fix-e9cfb8e0-540c-45ec-b3b7-313ac07c87a7.json b/packages/amazonq/.changes/next-release/Bug Fix-e9cfb8e0-540c-45ec-b3b7-313ac07c87a7.json
new file mode 100644
index 00000000000..aad1859209d
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Bug Fix-e9cfb8e0-540c-45ec-b3b7-313ac07c87a7.json	
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/review: Code review starts automatically when invoked from menu"
+}
diff --git a/packages/amazonq/src/app/amazonqScan/app.ts b/packages/amazonq/src/app/amazonqScan/app.ts
index d639ab6bf2a..8ef9ab29a97 100644
--- a/packages/amazonq/src/app/amazonqScan/app.ts
+++ b/packages/amazonq/src/app/amazonqScan/app.ts
@@ -25,7 +25,6 @@ export function init(appContext: AmazonQAppInitContext) {
         authClicked: new vscode.EventEmitter<any>(),
         tabOpened: new vscode.EventEmitter<any>(),
         tabClosed: new vscode.EventEmitter<any>(),
-        runScan: new vscode.EventEmitter<any>(),
         formActionClicked: new vscode.EventEmitter<any>(),
         errorThrown: new vscode.EventEmitter<any>(),
         showSecurityScan: new vscode.EventEmitter<any>(),
diff --git a/packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts b/packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts
index 599271f0f3b..242e6a9ec8f 100644
--- a/packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts
+++ b/packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts
@@ -48,7 +48,7 @@ export class ScanController {
         this.authController = new AuthController()
 
         this.chatControllerMessageListeners.tabOpened.event((data) => {
-            return this.tabOpened(data)
+            return this.tabOpened(data).then(() => this.scanInitiated(data))
         })
 
         this.chatControllerMessageListeners.tabClosed.event((data) => {
@@ -59,10 +59,6 @@ export class ScanController {
             this.authClicked(data)
         })
 
-        this.chatControllerMessageListeners.runScan.event((data) => {
-            return this.scanInitiated(data)
-        })
-
         this.chatControllerMessageListeners.formActionClicked.event((data) => {
             return this.formActionClicked(data)
         })
diff --git a/packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts b/packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts
index ede78d1a0bf..70793915d93 100644
--- a/packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts
+++ b/packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts
@@ -40,9 +40,6 @@ export class UIMessageListener {
             case 'auth-follow-up-was-clicked':
                 this.authClicked(msg)
                 break
-            case 'review':
-                this.scan(msg)
-                break
             case 'form-action-click':
                 this.formActionClicked(msg)
                 break
@@ -58,12 +55,6 @@ export class UIMessageListener {
         }
     }
 
-    private scan(msg: UIMessage) {
-        this.scanControllerEventsEmitters?.runScan.fire({
-            tabID: msg.tabID,
-        })
-    }
-
     private formActionClicked(msg: UIMessage) {
         this.scanControllerEventsEmitters?.formActionClicked.fire({
             ...msg,
diff --git a/packages/core/src/amazonq/webview/ui/connector.ts b/packages/core/src/amazonq/webview/ui/connector.ts
index e7d2d47bf24..215b523d37b 100644
--- a/packages/core/src/amazonq/webview/ui/connector.ts
+++ b/packages/core/src/amazonq/webview/ui/connector.ts
@@ -307,9 +307,6 @@ export class Connector {
             case 'doc':
                 this.docChatConnector.onTabOpen(tabID)
                 break
-            case 'review':
-                this.scanChatConnector.onTabOpen(tabID)
-                break
         }
     }
 
diff --git a/packages/core/src/amazonqScan/controller.ts b/packages/core/src/amazonqScan/controller.ts
index 7e928d6df69..6abc8e9c901 100644
--- a/packages/core/src/amazonqScan/controller.ts
+++ b/packages/core/src/amazonqScan/controller.ts
@@ -20,7 +20,6 @@ export interface ScanChatControllerEventEmitters {
     readonly tabOpened: vscode.EventEmitter<any>
     readonly tabClosed: vscode.EventEmitter<any>
     readonly authClicked: vscode.EventEmitter<any>
-    readonly runScan: vscode.EventEmitter<any>
     readonly formActionClicked: vscode.EventEmitter<any>
     readonly errorThrown: vscode.EventEmitter<any>
     readonly showSecurityScan: vscode.EventEmitter<any>