--- a/MultiViewToolApplication.st	Thu Jul 07 16:12:15 2011 +0200
+++ b/MultiViewToolApplication.st	Thu Jul 07 16:12:48 2011 +0200
@@ -898,7 +898,7 @@
     ].
 
     w := aWindow scrolledView.
-    w isKeyboardConsumer ifTrue:[
+    (w notNil and:[w isKeyboardConsumer]) ifTrue:[
         w takeFocusWhenMapped:true.
     ].
 
@@ -909,6 +909,7 @@
 "/    workspaceHolder value:aWindow.
 
     "Modified: / 22-01-2011 / 12:02:59 / cg"
+    "Modified: / 11-06-2011 / 00:05:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 addWorkspace
@@ -1347,5 +1348,5 @@
 !MultiViewToolApplication class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/MultiViewToolApplication.st,v 1.41 2011-07-06 16:19:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/MultiViewToolApplication.st,v 1.42 2011-07-07 14:12:48 vrany Exp $'
 ! !