diff --git a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
index 031809e42429..7c0ff49f0ec4 100644
--- a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+++ b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
@@ -265,7 +265,8 @@ public class GitCherryPicker {
   }
 
   private static String getSubjectFromCommitMessage(String commitMessage) {
-    return commitMessage.substring(0, commitMessage.indexOf("\n"));
+    int newLine = commitMessage.indexOf("\n");
+    return newLine < 0 ? commitMessage : commitMessage.substring(0, newLine);
   }
 
   /**