--- a/ResourceSelectionBrowser.st	Thu Feb 26 20:21:33 1998 +0100
+++ b/ResourceSelectionBrowser.st	Thu Feb 26 20:32:52 1998 +0100
@@ -550,7 +550,11 @@
     resourceMethod := aSelector.
     resourceTypes := aResourceTypes.
     resourceSuperclass := aSuperclassOrSymbol isClass ifTrue: [aSuperclassOrSymbol name] ifFalse: [aSuperclassOrSymbol].
-    resourceClass := aClassOrSymbol isClass ifTrue: [aClassOrSymbol name] ifFalse: [aClassOrSymbol].
+    resourceClass := aClassOrSymbol isClass 
+        ifTrue: [aClassOrSymbol name] 
+        ifFalse: [(Smalltalk at: aClassOrSymbol)
+            ifTrue:  [aClassOrSymbol]
+            ifFalse: [nil]].      
     self valueOfSelector value:(aSelector ? '').
 
     self open.
@@ -580,8 +584,11 @@
 
     |classSelection|
     allClasses := Object withAllSubclasses.
-    classSelection :=  resourceClass ? self class lastSelection.
-    (Smalltalk at: classSelection) isNil ifTrue: [classSelection := #Object].
+    classSelection :=  resourceClass. 
+    (Smalltalk at: classSelection) isNil 
+        ifTrue: [classSelection :=  self class lastSelection].
+    (Smalltalk at: classSelection) isNil 
+        ifTrue: [classSelection :=  #Object].
     classSelectionBlock := 
     [:clsPattern|                                  
         |foundClass classes|