diff --git a/src/main/kotlin/com/github/shautvast/autoprefixcommit/BranchNameCheckinHandler.kt b/src/main/kotlin/com/github/shautvast/autoprefixcommit/BranchNameCheckinHandler.kt
index 609240a..e0c9ff4 100644
--- a/src/main/kotlin/com/github/shautvast/autoprefixcommit/BranchNameCheckinHandler.kt
+++ b/src/main/kotlin/com/github/shautvast/autoprefixcommit/BranchNameCheckinHandler.kt
@@ -19,25 +19,18 @@ class BranchNameCheckinHandlerFactory : CheckinHandlerFactory() {
                 (panel.preferredFocusedComponent)?.addFocusListener(object : FocusAdapter() {
                     override fun focusGained(e: FocusEvent?) {
                         // update commit message
-                        val currentMessage = panel.commitMessage
-                        val modifiedMessage = modifyCommitMessage(currentMessage)
-                        panel.commitMessage = modifiedMessage
+                        val message = panel.commitMessage
+                        val repository = GitRepositoryManager.getInstance(panel.project).repositories.firstOrNull()
+                        repository?.let {
+                            it.currentBranchName?.let { b ->
+                                if (!message.startsWith(b)) {
+                                    panel.commitMessage = "$b $message"
+                                }
+                            }
+                        }
                     }
                 })
             }
-
-            fun modifyCommitMessage(message: String): String {
-                val repository = GitRepositoryManager.getInstance(panel.project).repositories.firstOrNull()
-
-                return repository?.let {
-                    val branchName = it.currentBranchName
-                    if (branchName != null && !message.startsWith("${branchName} ")) {
-                        "${it.currentBranchName ?: ""} ${message}"
-                    } else {
-                        message
-                    }
-                } ?: message
-            }
         }
     }
 }
\ No newline at end of file