--- a/EnterFieldGroup.st	Wed Aug 11 09:21:10 2010 +0200
+++ b/EnterFieldGroup.st	Tue Aug 24 16:13:15 2010 +0200
@@ -680,16 +680,18 @@
             ]
         ].
 
-        next isNil ifTrue:[
-            delta < 0 ifTrue:[
-                ^ wg focusPreviousFrom:aField
+        (wg := currentField windowGroup) notNil ifTrue:[
+            next isNil ifTrue:[
+                delta < 0 ifTrue:[
+                    ^ wg focusPreviousFrom:aField
+                ].
+                ^ wg focusNextFrom:aField.
             ].
-            ^ wg focusNextFrom:aField.
         ].
 
         nextField := fields at:next.
         explicit := false.
-        (wg := currentField windowGroup) notNil ifTrue:[
+        wg notNil ifTrue:[
             wg focusView == currentField ifTrue:[
                 explicit := true.
             ]
@@ -701,8 +703,9 @@
         ]
     ]
 
-    "Created: / 18.10.1997 / 03:03:34 / cg"
-    "Modified: / 18.9.1998 / 20:16:48 / cg"
+    "Created: / 18-10-1997 / 03:03:34 / cg"
+    "Modified: / 18-09-1998 / 20:16:48 / cg"
+    "Modified: / 24-08-2010 / 16:14:17 / az"
 ! !
 
 !EnterFieldGroup methodsFor:'misc'!
@@ -791,5 +794,9 @@
 !EnterFieldGroup class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.40 2007-03-02 14:59:35 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.41 2010-08-24 14:13:15 az Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.41 2010-08-24 14:13:15 az Exp $'
 ! !