--- a/TopView.st	Tue Feb 24 16:45:44 2015 +0100
+++ b/TopView.st	Tue Feb 24 16:47:12 2015 +0100
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libview' }"
 
+"{ NameSpace: Smalltalk }"
+
 View subclass:#TopView
 	instanceVariableNames:'type iconified keyboardProcessor'
 	classVariableNames:'TakeFocusWhenMapped ForceModalBoxesToOpenAtCenter
@@ -766,9 +768,9 @@
 
     (windowGroup notNil
     and:[(componentWithInitialFocus := windowGroup defaultKeyboardConsumer) notNil]) ifTrue:[
-	windowGroup focusView:componentWithInitialFocus byTab:true "false".
+        windowGroup focusView:componentWithInitialFocus byTab:true "false".
     ] ifFalse:[
-	self assignKeyboardFocusToFirstInputField.
+        self assignKeyboardFocusToFirstKeyboardConsumer.
     ].
 !
 
@@ -1478,11 +1480,11 @@
 !TopView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/TopView.st,v 1.152 2014-12-03 14:42:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/TopView.st,v 1.153 2015-02-24 15:47:12 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/TopView.st,v 1.152 2014-12-03 14:42:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/TopView.st,v 1.153 2015-02-24 15:47:12 cg Exp $'
 ! !