Index: default.py
===================================================================
RCS file: /cvs/gnome/orca/src/orca/default.py,v
retrieving revision 1.253
diff -u -r1.253 default.py
--- default.py	30 Nov 2006 21:47:15 -0000	1.253
+++ default.py	1 Dec 2006 17:14:57 -0000
@@ -3268,7 +3268,7 @@
             query = find.getLastQuery()
         if query:
             context = self.getFlatReviewContext()
-            location = query.findQuery(context)
+            location = query.findQuery(context, self.justEnteredFlatReviewMode)
             if not location:
                 braille.displayMessage(_("string not found"))
                 speech.speak(_("string not found"))
Index: find.py
===================================================================
RCS file: /cvs/gnome/orca/src/orca/find.py,v
retrieving revision 1.2
diff -u -r1.2 find.py
--- find.py	30 Nov 2006 22:59:57 -0000	1.2
+++ find.py	1 Dec 2006 17:14:58 -0000
@@ -96,11 +96,13 @@
                         (k, context.lines[i].zones[j].words[k].string, \
                          len(context.lines[i].zones[j].words[k].string))
 
-    def findQuery(self, context):
+    def findQuery(self, context, justEnteredFlatReview):
         """Performs a search on the string specified in searchQuery.
 
            Arguments:
            - context: The context from active script
+           - justEnteredFlatReview: If true, we began the search in focus
+             tracking mode.
 
            Returns:
            - The context of the match, if found
@@ -193,7 +195,8 @@
                                     context.wordIndex = nextInstance.index
                                     context.charIndex = 0
                                     found = True
-                                elif not offsetDiff and not startedInThisZone:
+                                elif not offsetDiff and \
+                                    (not startedInThisZone or justEnteredFlatReview):
                                     # We landed on a match by happenstance.
                                     # This can occur when the nextInstance is
                                     # the first thing we come across.
