diff --git a/.changes/next-release/feature-ad2ca8aa-4d8d-4dc4-92f6-5ae2916e3ec6.json b/.changes/next-release/feature-ad2ca8aa-4d8d-4dc4-92f6-5ae2916e3ec6.json
new file mode 100644
index 00000000000..410960df73a
--- /dev/null
+++ b/.changes/next-release/feature-ad2ca8aa-4d8d-4dc4-92f6-5ae2916e3ec6.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "/review: Code fix automatically scrolls into view after generation."
+}
\ 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 70bf1bbd0fc..0d6caed8715 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
@@ -71,6 +71,9 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
         )
         editorPane.revalidate()
         editorPane.repaint()
+        runInEdt {
+            editorPane.scrollToReference("fixLoadingSection")
+        }
 
         val codeFixResponse: AmazonQCodeFixSession.CodeFixResponse = amazonQCodeFixSession.runCodeFixWorkflow(issue)
         if (codeFixResponse.failureResponse != null) {
@@ -81,6 +84,9 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
                 )
                 revalidate()
                 repaint()
+                runInEdt {
+                    scrollToReference("fixFailureSection")
+                }
             }
         } else {
             val isReferenceAllowed = CodeWhispererSettings.getInstance().isIncludeCodeWithReference()
@@ -115,6 +121,9 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
                 )
                 revalidate()
                 repaint()
+                runInEdt {
+                    scrollToReference("codeFixActions")
+                }
             }
 
             buttonPane.apply {
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/utils/CodeWhispererCodeScanIssueUtils.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/utils/CodeWhispererCodeScanIssueUtils.kt
index 7848823da37..f1d581673b9 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/utils/CodeWhispererCodeScanIssueUtils.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/utils/CodeWhispererCodeScanIssueUtils.kt
@@ -137,6 +137,7 @@ fun getCodeScanIssueDetailsHtml(
     }
 
     val fixLoadingSection = """
+        <a name="fixLoadingSection"></a>
         <div align="center" bgcolor="#2b2b2b" style="margin: 20px;">
             <font size="7" color="#ffffff" face="Arial">
                 &nbsp;&nbsp;&nbsp;&nbsp;...&nbsp;&nbsp;&nbsp;&nbsp;
@@ -145,6 +146,7 @@ fun getCodeScanIssueDetailsHtml(
     """.trimIndent()
 
     val fixFailureSection = """
+        <a name="fixFailureSection"></a>
         <div align="center" bgcolor="#2b2b2b" style="margin: 20px;">
             <font size="4" color="#e6e6e6" face="Arial">
                 <br>Amazon Q failed to generate fix. Please try again<br>
@@ -192,6 +194,7 @@ private fun createSuggestedFixSection(issue: CodeWhispererCodeScanIssue, suggest
             |${it.code.trim()}
             |``` 
             |</div>
+            |<a name="codeFixActions"></a>
             |<div>
             |    <a href="amazonq://issue/openDiff-${issue.findingId}">
             |        <font size="+1"><i>&#x2194;</i></font> <b>Open Diff</b>