diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointMasterDetailPopupBuilder.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointMasterDetailPopupBuilder.java
index 566d5e508bd2..de42de817b72 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointMasterDetailPopupBuilder.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/tree/BreakpointMasterDetailPopupBuilder.java
@@ -279,17 +279,16 @@ public class BreakpointMasterDetailPopupBuilder {
   }
 
   private Set<XBreakpointGroupingRule> getInitialGroupingRules() {
-      java.util.HashSet<XBreakpointGroupingRule> rules = new java.util.HashSet<XBreakpointGroupingRule>();
-      XBreakpointsDialogState settings = ((XBreakpointManagerImpl)getBreakpointManager()).getBreakpointsDialogSettings();
-      if (settings != null) {
-        for (XBreakpointGroupingRule rule : myRulesAvailable) {
-          if (settings.getSelectedGroupingRules().contains(rule.getId()) || rule.isAlwaysEnabled()) {
-            rules.add(rule);
-          }
-        }
+    java.util.HashSet<XBreakpointGroupingRule> rules = new java.util.HashSet<XBreakpointGroupingRule>();
+    XBreakpointsDialogState settings = ((XBreakpointManagerImpl)getBreakpointManager()).getBreakpointsDialogSettings();
+
+    for (XBreakpointGroupingRule rule : myRulesAvailable) {
+      if (rule.isAlwaysEnabled() || (settings != null && settings.getSelectedGroupingRules().contains(rule.getId()) ) ) {
+        rules.add(rule);
       }
-      return rules;
     }
+    return rules;
+  }
 
   private XBreakpointManager getBreakpointManager() {
     return XDebuggerManager.getInstance(myProject).getBreakpointManager();