--- a/MenuEditor.st	Sun Nov 23 14:46:15 2014 +0100
+++ b/MenuEditor.st	Wed Nov 26 13:08:15 2014 +0100
@@ -4469,18 +4469,23 @@
 !
 
 retrieverList
-    |list cls|
-
-    list := builder bindingAt:#retrieverList.
-    list isNil ifTrue:[
-	list := MenuEditor imageRetrieverClasses asList.
-	builder aspectAt:#retrieverList put:list.
+    |listOfClassNames cls owner|
+
+    listOfClassNames := builder bindingAt:#retrieverList.
+    listOfClassNames isNil ifTrue:[
+        listOfClassNames := MenuEditor imageRetrieverClasses asList.
+        builder aspectAt:#retrieverList put:listOfClassNames.
     ].
     (masterApplication notNil
      and:[(cls := masterApplication specClass) notNil]) ifTrue:[
-	list := list copyWithFirst:cls.
+        (listOfClassNames includes:cls name) ifFalse:[ listOfClassNames addFirst:cls name ].
+        cls isPrivate ifTrue:[
+            (owner := cls owningClass) notNil ifTrue:[
+                (listOfClassNames includes:owner name) ifFalse:[ listOfClassNames addFirst:owner name ].   
+            ].
+        ].
     ].
-    ^ list
+    ^ listOfClassNames
 !
 
 selectorFilterHolder