diff --git a/platform/vcs-impl/src/com/intellij/vcs/commit/CommitOptionsPanel.kt b/platform/vcs-impl/src/com/intellij/vcs/commit/CommitOptionsPanel.kt
index abcc1dedfcb2..0e7e3d395059 100644
--- a/platform/vcs-impl/src/com/intellij/vcs/commit/CommitOptionsPanel.kt
+++ b/platform/vcs-impl/src/com/intellij/vcs/commit/CommitOptionsPanel.kt
@@ -49,8 +49,8 @@ internal class CommitOptionsPanel(
       border = contentBorder
     }
     component = ScrollPaneFactory.createScrollPane(panel,
-                                                   ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                                                   ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER,
+                                                   ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS,
+                                                   ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED,
                                                    true)
   }