diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
index 65e521cafd2c..10c487e25cdf 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.java
@@ -115,7 +115,12 @@ public class CodeStyleSchemesPanel{
       schemes.addAll(myModel.getAllSortedSchemes());
       DefaultComboBoxModel model = new DefaultComboBoxModel(schemes.toArray());
       myCombo.setModel(model);
-      myCombo.setSelectedItem(myModel.getSelectedGlobalScheme());
+      if (myModel.isUsePerProjectSettings()) {
+        myCombo.setSelectedItem(myModel.getProjectScheme());
+      }
+      else {
+        myCombo.setSelectedItem(myModel.getSelectedGlobalScheme());
+      }
     }
     finally {
       myIsReset = false;