diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
index b069e48e0f5e..b076b3e4af61 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
@@ -256,12 +256,14 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
       myLastKnownComment = comment;
       myLastSelectedListName = initialSelection == null ? myBrowser.getSelectedChangeList().getName() : initialSelection.getName();
     } else {
-      setCommitMessage(VcsConfiguration.getInstance(project).LAST_COMMIT_MESSAGE);
       updateComment();
 
-      String messageFromVcs = getInitialMessageFromVcs();
-      if (messageFromVcs != null) {
-        myCommitMessageArea.setText(messageFromVcs);
+      if (StringUtil.isEmptyOrSpaces(myCommitMessageArea.getComment())) {
+        setCommitMessage(VcsConfiguration.getInstance(project).LAST_COMMIT_MESSAGE);
+        final String messageFromVcs = getInitialMessageFromVcs();
+        if (messageFromVcs != null) {
+          myCommitMessageArea.setText(messageFromVcs);
+        }
       }
     }