--- a/Tools__BreakpointBrowser.st	Fri Jun 21 01:22:15 2013 +0200
+++ b/Tools__BreakpointBrowser.st	Fri Jun 21 01:37:57 2013 +0200
@@ -1142,6 +1142,7 @@
         ^ self
     ].
     method := entry method.
+    codeView editedMethodOrClass:method.
     method isNil ifTrue:[
         codeView contents:'OOPS - no source found'.
     ] ifFalse:[
@@ -1357,21 +1358,25 @@
             ].
         ].
 
-        mthd literalsDo:[:lit | 
-            lit class == Breakpoint ifTrue:[
-                entry := BreakpointListEntryForLineBreak new.
-                entry
-                    type:#line
-                    arg:nil
-                    className:cls name
-                    selector:sel
-                    lineNumber:(lit line)
-                    info:nil
-                    enabled:true.
-                entry breakPoint:lit.
-                aBlock value:entry 
-            ]
-        ].        
+        mthd isMethodWithBreakpoints ifTrue:[
+            mthd literalsDo:[:lit | 
+                lit class == Breakpoint ifTrue:[
+                    lit isVisible ifTrue:[
+                        entry := BreakpointListEntryForLineBreak new.
+                        entry
+                            type:#line
+                            arg:nil
+                            className:cls name
+                            selector:sel
+                            lineNumber:(lit line)
+                            info:nil
+                            enabled:true.
+                        entry breakPoint:lit.
+                        aBlock value:entry 
+                    ]
+                ]
+            ].        
+        ]
     ].
 ! !
 
@@ -1380,8 +1385,8 @@
 codeViewClass
     "the type of codeview to use"
 
-    ^ UserPreferences current useCodeView2
-        ifTrue:[ Tools::CodeView2 ]
+    ^ (UserPreferences current useCodeView2In: #Browser)
+        ifTrue:[ Tools::CodeView2 ? CodeView ]
         ifFalse:[ CodeView ]
 !
 
@@ -1981,11 +1986,11 @@
 !BreakpointBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.46 2013-06-20 22:34:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.47 2013-06-20 23:37:57 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.46 2013-06-20 22:34:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointBrowser.st,v 1.47 2013-06-20 23:37:57 cg Exp $'
 ! !