--- a/DialogBox.st	Tue Jan 09 19:16:58 1996 +0100
+++ b/DialogBox.st	Wed Jan 10 14:34:31 1996 +0100
@@ -1689,9 +1689,20 @@
      stepped through via FocusNext/FocusPrevious)"
 
     tabableElements isNil ifTrue:[
-	tabableElements := OrderedCollection new
+        tabableElements := OrderedCollection new
     ].
-    tabableElements add:aComponentOrSubcomponent
+    tabableElements add:aComponentOrSubcomponent.
+
+    (aComponentOrSubcomponent isKindOf:EditField) ifTrue:[
+        inputFieldGroup isNil ifTrue:[
+            inputFieldGroup := EnterFieldGroup new.
+            inputFieldGroup leaveAction:[self lastFieldLeft].
+            aComponentOrSubcomponent hasKeyboardFocus:true.
+        ].
+        inputFieldGroup add:aComponentOrSubcomponent.
+        self delegate:(KeyboardForwarder to:inputFieldGroup condition:#noFocus).
+    ].
+
 !
 
 rightIndent:aNumber 
@@ -1961,5 +1972,5 @@
 !DialogBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.32 1995-12-13 16:29:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/DialogBox.st,v 1.33 1996-01-10 13:34:31 ca Exp $'
 ! !