Index: src/orca/Gecko.py
===================================================================
--- src/orca/Gecko.py	(revision 2426)
+++ src/orca/Gecko.py	(working copy)
@@ -6100,15 +6100,19 @@
             speech.speak(_("No more form fields."))
 
     def goNextFormField(self, inputEvent):
-        # If the current object is a list item in a form field, we
-        # need to move to the end of this list before we search for
-        # the next list; otherwise we'll find the current list again.
+        # If the current object is a list item in a form field, or
+        # is a list itself, we need to move to the end of this list
+        # before we search for the next list; otherwise we'll find
+        # the current list again.
         #
         [obj, characterOffset] = self.getCaretContext()
         currentObj = obj
         if obj.role == rolenames.ROLE_LIST_ITEM and \
            obj.state.count(atspi.Accessibility.STATE_FOCUSABLE):
             obj = obj.parent.child(obj.parent.childCount - 1)
+        elif obj.role == rolenames.ROLE_LIST and \
+             obj.state.count(atspi.Accessibility.STATE_FOCUSED):
+            obj = obj.child(obj.childCount - 1)
 
         found = False
         wrapped = False
