--- a/KeyboardForwarder.st	Thu May 01 17:39:33 1997 +0200
+++ b/KeyboardForwarder.st	Thu May 01 17:46:34 1997 +0200
@@ -410,13 +410,16 @@
 !KeyboardForwarder methodsFor:'queries'!
 
 checkCondition:type key:key view:aView
+    |wg|
+
     filter notNil ifTrue:[
         (filter value:key) ifFalse:[^ false].
     ].
 
     condition notNil ifTrue:[
         condition == #noFocus ifTrue:[
-            aView windowGroup focusView notNil ifTrue:[^ false]
+	    wg := aView windowGroup.
+	    (wg isNil or:[wg focusView notNil]) ifTrue:[^ false]
         ].
         condition isBlock ifTrue:[
             (condition value:type value:key value:aView) ifFalse:[^ false]
@@ -455,5 +458,5 @@
 !KeyboardForwarder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/KeyboardForwarder.st,v 1.18 1997-02-25 22:18:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/KeyboardForwarder.st,v 1.19 1997-05-01 15:46:34 cg Exp $'
 ! !