--- a/Tools__NewSystemBrowser.st	Fri Feb 12 00:07:50 2016 +0100
+++ b/Tools__NewSystemBrowser.st	Fri Feb 12 10:42:15 2016 +0100
@@ -27369,12 +27369,17 @@
 !
 
 createBufferForCurrentClassOrSelectionInCodeView
-    |navigationState cls|
+    |cls selector|
 
     cls := self selectedClassNameInCodeViewOrNil.
-    navigationState := self createBuffer.
+    cls isNil ifTrue:[
+        "no text selected in codeview, select currently selected class and method"
+        cls := self theSingleSelectedClass.
+        selector := self theSingleSelectedMethodName.
+    ].
+    self createBuffer.
     cls notNil ifTrue:[
-        self switchToClass:cls
+        self switchToClass:cls selector:selector updateHistory:selector isNil.
     ]
 !