diff --git a/camino/src/browser/AutoCompleteTextField.mm b/camino/src/browser/AutoCompleteTextField.mm
index ae43f00ab51..5717579e55a 100644
--- a/camino/src/browser/AutoCompleteTextField.mm
+++ b/camino/src/browser/AutoCompleteTextField.mm
@@ -654,6 +654,11 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener)
       [self selectRowBy:1];
       [self completeSelectedResult];
       return YES;
+    } else {
+      // The usual nextKeyView business in the NIB should handle but it doesn't
+      // this is basically a benign hack
+      NSWindow* wind = [self window];
+      [wind makeFirstResponder:wind];
     }
   } else if (command == @selector(deleteBackward:) || 
              command == @selector(deleteForward:)) {