diff --git a/mozilla/camino/src/find/FindBarController.mm b/mozilla/camino/src/find/FindBarController.mm
index 9119261e42f..fb039508182 100644
--- a/mozilla/camino/src/find/FindBarController.mm
+++ b/mozilla/camino/src/find/FindBarController.mm
@@ -148,8 +148,13 @@
 {
   [self doFindForwards:YES];
   // Return/enter ends editing and unfocuses the search field, which we don't
-  // want. Rather than setting up a custom field editor, just force focus back. 
-  [[mSearchField window] makeFirstResponder:mSearchField];
+  // want. Rather than setting up a custom field editor, just force focus back
+  // if it's not focused.
+  if (![mSearchField currentEditor] ||
+      [[mSearchField window] firstResponder] != [mSearchField currentEditor])
+  {
+    [[mSearchField window] makeFirstResponder:mSearchField];
+  }
 }
 
 - (IBAction)findPrevious:(id)sender