--- a/ApplicationModel.st	Tue Feb 13 20:17:58 2001 +0100
+++ b/ApplicationModel.st	Tue Mar 06 13:42:04 2001 +0100
@@ -2161,8 +2161,16 @@
 
     |sav|
 
-    (self window isNil
-    or:[self window isTopView not]) ifTrue:[
+    (self window isNil) ifTrue:[
+        'ApplicationModel [warning]: oops - closeRequest for non-view application arrived' infoPrintCR.
+        ^ self
+    ].
+
+    (self window isTopView not) ifTrue:[
+        self window topView isModal ifTrue:[
+            WindowGroup leaveSignal raise.
+        ].
+
         'ApplicationModel [warning]: oops - closeRequest for non-TopView arrived' infoPrintCR.
         ^ self
     ].
@@ -2454,6 +2462,6 @@
 !ApplicationModel class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.153 2001-01-12 10:58:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ApplicationModel.st,v 1.154 2001-03-06 12:42:04 tm Exp $'
 ! !
 ApplicationModel initialize!