diff --git a/.changes/next-release/feature-4e0e76eb-a634-47e2-9e73-4e7dfde76160.json b/.changes/next-release/feature-4e0e76eb-a634-47e2-9e73-4e7dfde76160.json
new file mode 100644
index 00000000000..02545a38320
--- /dev/null
+++ b/.changes/next-release/feature-4e0e76eb-a634-47e2-9e73-4e7dfde76160.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "/review: automatically generate fix without clicking Generate Fix button"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanIssueDetailsPanel.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanIssueDetailsPanel.kt
index e4e723b7c7b..b93c67a6350 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanIssueDetailsPanel.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanIssueDetailsPanel.kt
@@ -333,5 +333,10 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
         add(BorderLayout.SOUTH, buttonPane)
         isVisible = true
         revalidate()
+        if (issue.suggestedFixes.isEmpty()) {
+            defaultScope.launch {
+                handleGenerateFix(issue)
+            }
+        }
     }
 }