diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
index a0f74afaba82..256875a0cc7a 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ui/CommitMessage.java
@@ -187,7 +187,7 @@ public class CommitMessage extends JPanel implements Disposable {
       protected EditorEx createEditor() {
         final EditorEx ex = super.createEditor();
         ex.setOneLineMode(false);
-        ex.setVerticalScrollbarVisible(false);
+        ex.getScrollPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
         ex.setHorizontalScrollbarVisible(true);
         EditorSettings settings = ex.getSettings();
         settings.setUseSoftWraps(true);