diff --git a/cli/src/config/templates.toml b/cli/src/config/templates.toml
index 270bd224c..41dd692f7 100644
--- a/cli/src/config/templates.toml
+++ b/cli/src/config/templates.toml
@@ -118,9 +118,10 @@ label(if(overridden, "overridden"),
 builtin_draft_commit_description = '''
 concat(
   coalesce(description, default_commit_description, "\n"),
-  "\nJJ: Change ID: " ++ format_short_change_id(change_id) ++ "",
+  "\n",
+  "JJ: Change ID: " ++ format_short_change_id(change_id) ++ "\n",
   surround(
-    "\nJJ: This commit contains the following changes:\n", "",
+    "JJ: This commit contains the following changes:\n", "",
     indent("JJ:     ", diff.summary()),
   ),
 )