--- a/EnterFieldGroup.st	Fri Jun 13 23:06:30 2014 +0200
+++ b/EnterFieldGroup.st	Fri Jun 13 23:06:48 2014 +0200
@@ -686,13 +686,15 @@
             ]
         ].
 
-        (wg := currentField windowGroup) notNil ifTrue:[
-            next isNil ifTrue:[
+        next isNil ifTrue:[
+            (wg := currentField windowGroup) notNil ifTrue:[
                 delta < 0 ifTrue:[
-                    ^ wg focusPreviousFrom:aField
+                    wg focusPreviousFrom:aField
+                ] ifFalse:[
+                    wg focusNextFrom:aField.
                 ].
-                ^ wg focusNextFrom:aField.
             ].
+            ^ self.
         ].
 
         nextField := fields at:next.
@@ -798,10 +800,10 @@
 !EnterFieldGroup class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.42 2014-06-11 13:45:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.43 2014-06-13 21:06:48 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.42 2014-06-11 13:45:58 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/EnterFieldGroup.st,v 1.43 2014-06-13 21:06:48 cg Exp $'
 ! !