1 files changed, 6 insertions, 1 deletions
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingComponent.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingComponent.java
index c86f3ca734f1..4bb84a63e397 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingComponent.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/group/ArrangementGroupingComponent.java
@@ -101,7 +101,7 @@ public class ArrangementGroupingComponent extends JPanel implements ArrangementR
       myGroupingTypeToken.setListener(new ArrangementUiComponent.Listener() {
         @Override
         public void stateChanged() {
-          myOrderTypeToken.setEnabled(myGroupingTypeToken.isEnabled());
+          myOrderTypeToken.setEnabled(myGroupingTypeToken.isSelected());
         }
       });
     }
@@ -123,6 +123,7 @@ public class ArrangementGroupingComponent extends JPanel implements ArrangementR
     
     setBackground(UIUtil.getListBackground());
     setBorder(IdeBorderFactory.createEmptyBorder(ArrangementConstants.VERTICAL_GAP));
+    setOpaque(!UIUtil.isUnderIntelliJLaF() && !UIUtil.isUnderNativeMacLookAndFeel() && !UIUtil.isUnderDarcula());
   }
 
   @Override
@@ -135,6 +136,10 @@ public class ArrangementGroupingComponent extends JPanel implements ArrangementR
         myRowIndexControl.setBaseLine(baseline);
       }
     }
+    if (UIUtil.isUnderIntelliJLaF() || UIUtil.isUnderDarcula() || UIUtil.isUnderNativeMacLookAndFeel()) {
+      g.setColor(getBackground());
+      g.fillRect(1, 1, getWidth() - 2, getHeight() - 2);
+    }
     super.paintComponent(g);
   }