diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java
index 3eb31d3c2505..ce66a70488dd 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java
@@ -418,6 +418,9 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Configurab
         errorPanel.add(vcsRootErrorLabel);
       }
     }
+    if (errorPanel.getComponentCount() == 0) {
+      pane.setVisible(false);
+    }
     pane.setMinimumSize(new Dimension(-1, calcMinHeight(errorPanel, DEFAULT_HEIGHT)));
     pane.setMaximumSize(new Dimension(-1, DEFAULT_HEIGHT));
     return pane;