diff --git a/cli/src/config/templates.toml b/cli/src/config/templates.toml
index 1a5355ee7..a2b66c6e8 100644
--- a/cli/src/config/templates.toml
+++ b/cli/src/config/templates.toml
@@ -80,8 +80,8 @@ builtin_log_comfortable = 'builtin_log_compact ++ "\n"'
 concat(
   "Commit ID: " ++ commit_id ++ "\n",
   "Change ID: " ++ change_id ++ "\n",
-  if(branches, "Branches: " ++ separate(" ", local_branches, remote_branches) ++ "\n"),
-  if(tags, "Tags: " ++ tags ++ "\n"),
+  surround("Branches: ", "\n", separate(" ", local_branches, remote_branches)),
+  surround("Tags: ", "\n", tags),
   "Author: " ++ format_detailed_signature(author) ++ "\n",
   "Committer: " ++ format_detailed_signature(committer)  ++ "\n",
   "\n",