--- a/ApplicationModel.st	Mon Mar 13 20:25:57 2006 +0100
+++ b/ApplicationModel.st	Thu Mar 16 23:34:44 2006 +0100
@@ -2720,6 +2720,15 @@
     "/ to remember the accept vs. cancel case.
     "/
     self window isModal ifTrue:[
+        masterApplication notNil ifTrue:[
+            masterApplication window topView == self window topView ifTrue:[
+                masterApplication window isModal ifTrue:[
+                    masterApplication doAccept.
+                    ^ self.
+                ].
+            ].
+        ].
+
         "/ mhmh - is this a good idea ?
         self perform:#accept ifNotUnderstood:[self closeRequest].
         ^ self
@@ -2916,7 +2925,7 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.224 2006-03-02 11:07:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.225 2006-03-16 22:34:44 cg Exp $'
 ! !
 
 ApplicationModel initialize!