diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j
index e64a7e46b..f32da7d9f 100644
--- a/AppKit/CPSearchField.j
+++ b/AppKit/CPSearchField.j
@@ -470,7 +470,11 @@ var RECENT_SEARCH_PREFIX = @"   ";
 
 - (CPView)hitTest:(CGPoint)aPoint
 {
-    return self;
+    // Make sure a hit anywhere within the search field returns the search field itself    
+    if (_CGRectContainsPoint([self frame], aPoint))
+        return self;
+    else
+        return nil;
 }
 
 - (BOOL)resignFirstResponder