diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
index e066a6d211a3..2c2820311f8b 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
@@ -244,6 +244,7 @@ public class CodeStyleMainPanel extends JPanel implements TabbedLanguageCodeStyl
         if (currentTab != null) {
           tabbedPanel.changeTab(currentTab);
         }
+        mySchemesPanel.setSeparatorVisible(false);
       }
       mySettingsPanels.put(name, panel);
       mySettingsPanel.add(scheme.getName(), panel);
diff --git a/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java b/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
index 739f3a544ec9..f8e995939f64 100644
--- a/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
+++ b/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java
@@ -63,7 +63,8 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
   private static final Color ERROR_MESSAGE_FOREGROUND = Color.RED;
 
   protected static final int DEFAULT_VGAP = 8;
-  
+  private JSeparator mySettingsPanelSeparator;
+
   // endregion
 
   AbstractSchemesPanel() {
@@ -93,13 +94,18 @@ public abstract class AbstractSchemesPanel<T extends Scheme, InfoComponent exten
       horizontalContainer.add(rightCustomComponent);
       add(horizontalContainer);
     }
-    add(new JSeparator());
+    mySettingsPanelSeparator = new JSeparator();
+    add(mySettingsPanelSeparator);
     if (vGap > 0) {
       add(Box.createVerticalGlue());
       add(Box.createRigidArea(new JBDimension(0, vGap)));
     }
   }
 
+  public void setSeparatorVisible(boolean visible) {
+    mySettingsPanelSeparator.setVisible(visible);
+  }
+
   @NotNull
   private static JPanel createVerticalContainer() {
     JPanel container = new JPanel();