--- a/MenuEditor.st	Sat May 05 07:40:28 2001 +0200
+++ b/MenuEditor.st	Sat May 05 08:11:16 2001 +0200
@@ -124,7 +124,10 @@
         aSymbolOrClass isBehavior ifTrue:[
             key := aSymbolOrClass nameWithNameSpacePrefix
         ]
+    ] ifTrue:[
+        key := aSymbolOrClass
     ].
+
     key size ~~ 0 ifTrue:[
         key := key asSymbol.
 
@@ -2220,16 +2223,18 @@
         newList := self listOfImages
     ] ifFalse:[
         cls notNil ifTrue:[
-            lastImageRetriever := cls.
-
-            newList := self class getAllImageSelectorsFrom:cls.
-            newList := newList collect: [:sel| |img| 
-                            img := cls perform: sel. 
-                            img height > 22 ifTrue:[
-                                img := img magnifiedBy: 22 / img extent y
-                            ].
-                            LabelAndIcon icon:img string:sel
-                       ].
+            self withWaitCursorDo:[
+                lastImageRetriever := cls.
+
+                newList := self class getAllImageSelectorsFrom:cls.
+                newList := newList collect: [:sel| |img| 
+                                img := cls perform: sel. 
+                                img height > 22 ifTrue:[
+                                    img := img magnifiedBy: 22 / img extent y
+                                ].
+                                LabelAndIcon icon:img string:sel
+                           ].
+                ].
         ] ifFalse:[
             newList := #()
         ].
@@ -2242,8 +2247,6 @@
         icon := newList detect:[:el| el string == icon] ifNone:nil.
     ].
     self selectionOfImage value:icon.
-
-
 ! !
 
 !MenuEditor methodsFor:'defaults'!