--- a/ApplicationModel.st	Wed Oct 15 17:06:20 1997 +0200
+++ b/ApplicationModel.st	Wed Oct 15 18:07:03 1997 +0200
@@ -1199,8 +1199,18 @@
      first we are looking in the namespace of the application, than of the
      current namespace and than in Smalltalk
     "
+    |cls|
 
-    ^ Smalltalk resolveName:something inClass:aClass.
+    aClass notNil ifTrue:[
+        (cls := Smalltalk resolveName:something inClass:aClass) notNil ifTrue:[
+            ^ cls
+        ].
+
+        masterApplication notNil ifTrue:[
+            ^ masterApplication resolveName:something
+        ]
+    ].
+    ^ nil
 ! !
 
 !ApplicationModel methodsFor:'startup / release'!
@@ -1476,6 +1486,6 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.59 1997-10-15 10:51:24 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.60 1997-10-15 16:07:03 ca Exp $'
 ! !
 ApplicationModel initialize!