diff --git a/camino/src/find/FindDlgController.mm b/camino/src/find/FindDlgController.mm
index 549a124b9527..1a867f6aecce 100644
--- a/camino/src/find/FindDlgController.mm
+++ b/camino/src/find/FindDlgController.mm
@@ -118,8 +118,10 @@
 - (IBAction) findNextAndOrderOut: (id)aSender
 {
   [self putFindStringOnPasteboard];
-  if (![self find:NO])
+  if (![self find:NO]) {
     NSBeep();
+    [[self window] makeFirstResponder:mSearchField];
+  }
   else
     [self close];
 }