diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
index 9b5e7c7cde4e..70f3857409df 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
@@ -89,6 +89,7 @@ public final class VcsConfiguration implements PersistentStateComponent<VcsConfi
   public boolean USE_COMMIT_MESSAGE_MARGIN = false;
   public int COMMIT_MESSAGE_MARGIN_SIZE = 72;
   public boolean WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = false;
+  public boolean SHOW_UNREGISTERED_ROOTS_IN_SETTINGS = true;
 
   public enum StandardOption {
     ADD(VcsBundle.message("vcs.command.name.add")),
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 899354997a06..bc9d11f927dc 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
@@ -16,6 +16,7 @@
 
 package com.intellij.openapi.vcs.configurable;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.options.Configurable;
@@ -127,18 +128,16 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Configurab
     }
   }
 
-  private static class MyDirectoryRenderer extends ColoredTableCellRenderer {
-    private final Project myProject;
-
-    public MyDirectoryRenderer(Project project) {
-      myProject = project;
-    }
-
+  private class MyDirectoryRenderer extends ColoredTableCellRenderer {
     @Override
     protected void customizeCellRenderer(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
       if (value instanceof MapInfo) {
         MapInfo info = (MapInfo)value;
 
+        if (!myVcsConfiguration.SHOW_UNREGISTERED_ROOTS_IN_SETTINGS && !info.type.isRegistered()) {
+          return;
+        }
+
         if (!selected && (info == MapInfo.SEPARATOR || info.type == MapInfo.Type.UNREGISTERED)) {
           setBackground(getUnregisteredRootBackground());
         }
@@ -220,6 +219,10 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Configurab
         return new ColoredTableCellRenderer() {
           @Override
           protected void customizeCellRenderer(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
+            if (!myVcsConfiguration.SHOW_UNREGISTERED_ROOTS_IN_SETTINGS && !info.type.isRegistered()) {
+              return;
+            }
+
             if (info == MapInfo.SEPARATOR) {
               if (!selected) {
                 setBackground(getUnregisteredRootBackground());
@@ -313,7 +316,7 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Configurab
     setLayout(new BorderLayout());
     add(createMainComponent());
 
-    myDirectoryRenderer = new MyDirectoryRenderer(myProject);
+    myDirectoryRenderer = new MyDirectoryRenderer();
     DIRECTORY = new ColumnInfo<MapInfo, MapInfo>(VcsBundle.message("column.info.configure.vcses.directory")) {
       @Override
       public MapInfo valueOf(final MapInfo mapping) {
@@ -565,7 +568,18 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Configurab
         public boolean isEnabled(AnActionEvent e) {
           return !myIsDisabled && onlyRegisteredRootsInSelection();
         }
-      }).disableUpDownActions().createPanel();
+      }).disableUpDownActions().addExtraAction(new ToggleActionButton("Show unregistered roots", AllIcons.General.Filter) {
+        @Override
+        public boolean isSelected(AnActionEvent e) {
+          return myVcsConfiguration.SHOW_UNREGISTERED_ROOTS_IN_SETTINGS;
+        }
+
+        @Override
+        public void setSelected(AnActionEvent e, boolean state) {
+          myVcsConfiguration.SHOW_UNREGISTERED_ROOTS_IN_SETTINGS = state;
+          myDirectoryMappingTable.repaint();
+        }
+      }).createPanel();
     panelForTable.setPreferredSize(new Dimension(-1, 200));
     return panelForTable;
   }