diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
index 02217236f4ed..35e5b86567f2 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointManager.java
@@ -777,9 +777,10 @@ public class BreakpointManager {
             breakpoint = createJavaBreakpoint(xBreakpoint);
             myBreakpoints.put(xBreakpoint, breakpoint);
           }
-          myBreakpointsListForIteration.add(breakpoint);
         }
       }
+
+      myBreakpointsListForIteration.addAll(myBreakpoints.values());
     }
     return myBreakpointsListForIteration;
   }