1 files changed, 12 insertions, 7 deletions
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingRulesControl.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingRulesControl.java
index 581eb0aa96a2..a847aecd289f 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingRulesControl.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingRulesControl.java
@@ -38,6 +38,7 @@ import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * @author Denis Zhdanov
@@ -95,17 +96,21 @@ public class ArrangementGroupingRulesControl extends JBTable {
       model.removeRow(model.getRowCount() - 1);
     }
 
-    List<ArrangementSettingsToken> types = ContainerUtilRt.newArrayList(myComponents.keySet());
+    final Set<ArrangementSettingsToken> groupingTokens = ContainerUtilRt.newHashSet(myComponents.keySet());
+    for (ArrangementGroupingRule rule : rules) {
+      final ArrangementSettingsToken groupingType = rule.getGroupingType();
+      ArrangementGroupingComponent component = myComponents.get(groupingType);
+      component.setSelected(true);
+      component.setOrderType(rule.getOrderType());
+      model.addRow(new Object[]{component});
+      groupingTokens.remove(groupingType);
+    }
+
+    List<ArrangementSettingsToken> types = ContainerUtilRt.newArrayList(groupingTokens);
     types = mySettingsManager.sort(types);
     for (ArrangementSettingsToken type : types) {
       model.addRow(new Object[]{myComponents.get(type)});
     }
-    for (ArrangementGroupingRule rule : rules) {
-      ArrangementGroupingComponent component = myComponents.get(rule.getGroupingType());
-      component.setSelected(true);
-      ArrangementSettingsToken orderType = rule.getOrderType();
-      component.setOrderType(orderType);
-    }
   }
 
   @NotNull