--- a/MenuPanel.st	Sun Oct 15 17:08:31 2000 +0200
+++ b/MenuPanel.st	Fri Oct 27 15:15:35 2000 +0200
@@ -3551,11 +3551,12 @@
 application
     "optimize access to retrive the application
     "
-    |appl akey|
+    |appl akey w|
 
     superMenu notNil ifTrue:[
         ^ superMenu application
     ].
+
     akey := #appl.
     appl := self menuAdornmentAt:akey.
 
@@ -3564,12 +3565,16 @@
             windowGroup isNil ifTrue:[
                 ^ nil   "/ RETRY LATER
             ].
-            appl := (windowGroup mainGroup topViews first application) ? akey
+            w := windowGroup mainGroup topViews first.
+            w == self ifTrue:[
+                appl := akey
+            ] ifFalse:[
+                appl := (w application) ? akey
+            ].
         ].
         self menuAdornmentAt:akey put:appl
     ].
-    ^ appl ~~ akey ifTrue:[appl] ifFalse:[nil]
-!
+    ^ appl ~~ akey ifTrue:[appl] ifFalse:[nil]!
 
 detectItemForKey:aKey
     "returns the item assigned to a key, accessCharacter or starts with.
@@ -6235,6 +6240,6 @@
 !MenuPanel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.250 2000-10-10 07:25:25 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/MenuPanel.st,v 1.251 2000-10-27 13:15:35 ca Exp $'
 ! !
 MenuPanel initialize!