diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java
index 72bf323bd99f..103f666e4222 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java
@@ -38,6 +38,12 @@ public class AddArrangementRuleAction extends AbstractArrangementRuleAction impl
     setEnabledInModalContext(true);
   }
 
+  @Override
+  public void update(AnActionEvent e) {
+    ArrangementMatchingRulesControl control = getRulesControl(e);
+    e.getPresentation().setEnabled(control != null);
+  }
+
   @Override
   public void actionPerformed(AnActionEvent e) {
     ArrangementMatchingRulesControl control = getRulesControl(e);
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java
index 17acf56b36b1..667ac7d7cd4b 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementSectionRuleAction.java
@@ -39,6 +39,7 @@ public class AddArrangementSectionRuleAction extends AddArrangementRuleAction {
   public void update(AnActionEvent e) {
     final ArrangementMatchingRulesControl control = getRulesControl(e);
     if (control == null || !(control instanceof ArrangementSectionRulesControl)) {
+      e.getPresentation().setEnabledAndVisible(false);
       return;
     }
     e.getPresentation().setEnabledAndVisible(((ArrangementSectionRulesControl)control).getSectionRuleManager() != null);