diff --git a/.changes/next-release/bugfix-28ad12be-ac9d-4ece-b538-48613ab94969.json b/.changes/next-release/bugfix-28ad12be-ac9d-4ece-b538-48613ab94969.json
new file mode 100644
index 00000000000..120bbabe4af
--- /dev/null
+++ b/.changes/next-release/bugfix-28ad12be-ac9d-4ece-b538-48613ab94969.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/transform: always include button to start a new transformation at the end of a job"
+}
\ No newline at end of file
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
index 8d62a1c628c..22bc8637674 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
@@ -31,7 +31,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESH
 import software.aws.toolkits.jetbrains.services.amazonq.CODE_TRANSFORM_TROUBLESHOOT_DOC_DOWNLOAD_EXPIRED
 import software.aws.toolkits.jetbrains.services.codemodernizer.client.GumbyClient
 import software.aws.toolkits.jetbrains.services.codemodernizer.commands.CodeTransformMessageListener
-import software.aws.toolkits.jetbrains.services.codemodernizer.constants.buildStartNewTransformFollowup
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.createViewDiffButton
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.getDownloadedArtifactTextFromType
 import software.aws.toolkits.jetbrains.services.codemodernizer.constants.viewSummaryButton
@@ -317,7 +316,6 @@ class ArtifactHandler(
                         message = message("codemodernizer.chat.message.changes_applied"),
                     )
                     codeTransformChatHelper?.updateLastPendingMessage(resultContent)
-                    codeTransformChatHelper?.addNewMessage(buildStartNewTransformFollowup())
                 } else {
                     if (getCurrentPatchIndex() < totalPatchFiles) {
                         val message = "I applied the changes in diff patch ${getCurrentPatchIndex() + 1} of $totalPatchFiles. " +
@@ -331,7 +329,6 @@ class ArtifactHandler(
                             codeTransformChatHelper?.updateLastPendingMessage(
                                 CodeTransformChatMessageContent(type = CodeTransformChatMessageType.PendingAnswer, message = message)
                             )
-                            codeTransformChatHelper?.addNewMessage(buildStartNewTransformFollowup())
                         } else {
                             codeTransformChatHelper?.updateLastPendingMessage(
                                 CodeTransformChatMessageContent(
@@ -345,7 +342,7 @@ class ArtifactHandler(
                             )
                         }
                     } else {
-                        codeTransformChatHelper?.addNewMessage(buildStartNewTransformFollowup())
+                        // no-op; start a new transformation button already visible at this point
                     }
                 }
             } else {
diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
index 667f806888b..9c03fbdf514 100644
--- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
+++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt
@@ -600,6 +600,7 @@ fun buildTransformResultChatContent(result: CodeModernizerJobCompletedResult, to
         } else {
             null
         },
+        followUps = listOf(startNewTransformFollowUp),
     )
 }