diff --git a/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/models/BreakpointsTreeModel.java b/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/models/BreakpointsTreeModel.java
--- a/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/models/BreakpointsTreeModel.java
+++ b/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/models/BreakpointsTreeModel.java
@@ -213,6 +213,10 @@
                 DebuggerManager.PROP_BREAKPOINTS,
                 this
             );
+            DebuggerManager.getDebuggerManager ().addDebuggerListener (
+                DebuggerManager.PROP_CURRENT_SESSION,
+                this
+            );
             Breakpoint[] bs = DebuggerManager.getDebuggerManager ().
                 getBreakpoints ();
             int i, k = bs.length;
@@ -227,6 +231,10 @@
                     DebuggerManager.PROP_BREAKPOINTS,
                     this
                 );
+                DebuggerManager.getDebuggerManager ().removeDebuggerListener (
+                    DebuggerManager.PROP_CURRENT_SESSION,
+                    this
+                );
                 Breakpoint[] bs = DebuggerManager.getDebuggerManager ().
                     getBreakpoints ();
                 int i, k = bs.length;
@@ -256,8 +264,6 @@
         public void propertyChange (PropertyChangeEvent evt) {
             BreakpointsTreeModel m = getModel ();
             if (m == null) return;
-            if (! (evt.getSource () instanceof Breakpoint))
-                return;
             String propertyName = evt.getPropertyName();
             if (propertyName == Breakpoint.PROP_GROUP_NAME) {
                 m.fireTreeChanged ();