--- a/Tools__SearchDialog.st	Fri Oct 14 16:08:01 2016 +0200
+++ b/Tools__SearchDialog.st	Fri Oct 14 17:57:49 2016 +0200
@@ -178,10 +178,18 @@
 
 !SearchDialog methodsFor:'accessing'!
 
+currentClass:aClass
+    currentClass := aClass   
+!
+
 currentPackage
     ^ currentPackage
 !
 
+currentPackage:aPackage
+    currentPackage := aPackage   
+!
+
 initialText:aString
     initialText := aString.
 !
@@ -723,7 +731,7 @@
                 ].
             ].
         ].
-        (currentPackage notNil and:[ currentPackage ~= (browser nameListEntryForALL) ]) 
+        (currentPackage notNil and:[ browser isNil or:[ currentPackage ~= (browser nameListEntryForALL) ]]) 
         ifTrue:[ 
             self addCheckBoxForCurrentPackage.
             self addCheckBoxForCurrentPackageAndSubPackages.
@@ -732,6 +740,9 @@
                 self addCheckBoxForClassesPackage:(currentClass package) 
             ].
         ].
+        currentClass notNil ifTrue:[
+            self addCheckBoxForSelectedClass
+        ].    
     ].
     searchAreas isEmptyOrNil ifTrue:[
         self addCheckBoxForEverywhere.
@@ -1038,9 +1049,9 @@
 addCheckBoxForSelectedClass
     |b lbl arg|
 
-    (browser isMethodListBrowser 
+    ((browser notNil and:[browser isMethodListBrowser])
     or:[ currentClass isNil
-    or:[ selectedClasses size > 1] ]) ifTrue:[ 
+    or:[ selectedClasses size > 1]]) ifTrue:[ 
         selectedClasses size == 1 ifTrue:[ 
             lbl := 'Selected class ("%1")'.
             arg := selectedClasses first theNonMetaclass name.