--- a/WindowGroup.st	Fri Mar 19 08:28:30 1999 +0100
+++ b/WindowGroup.st	Fri Mar 19 10:46:02 1999 +0100
@@ -1688,14 +1688,16 @@
     |prevFocusView myDisplay|
 
     myDisplay := self graphicsDevice.
-    prevFocusView := FocusViewPerDisplay at:myDisplay ifAbsent:nil.
+    myDisplay notNil ifTrue:[
+        prevFocusView := FocusViewPerDisplay at:myDisplay ifAbsent:nil.
 
-    (prevFocusView notNil 
-    and:[prevFocusView ~~ aViewOrNil]) ifTrue:[
-        prevFocusView showNoFocus:true.
-        prevFocusView hasKeyboardFocus:false.
+        (prevFocusView notNil 
+        and:[prevFocusView ~~ aViewOrNil]) ifTrue:[
+            prevFocusView showNoFocus:true.
+            prevFocusView hasKeyboardFocus:false.
+        ].
+        FocusViewPerDisplay at:myDisplay put:aViewOrNil.
     ].
-    FocusViewPerDisplay at:myDisplay put:aViewOrNil.
 
     focusView == aViewOrNil ifTrue:[
         focusView notNil ifTrue:[
@@ -2004,6 +2006,6 @@
 !WindowGroup class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.163 1999-03-19 07:28:30 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WindowGroup.st,v 1.164 1999-03-19 09:46:02 cg Exp $'
 ! !
 WindowGroup initialize!