diff --git a/AppKit/CPBrowser.j b/AppKit/CPBrowser.j
index 2774d8242..8d524b4ed 100644
--- a/AppKit/CPBrowser.j
+++ b/AppKit/CPBrowser.j
@@ -213,6 +213,8 @@
     [table setAllowsEmptySelection:_allowsEmptySelection];
     [table registerForDraggedTypes:[self registeredDraggedTypes]];
 
+    [self setNextResponder:table];
+
     [self _addTableColumnsToTableView:table forColumnIndex:index];
 
     var delegate = [[_CPBrowserTableDelegate alloc] init];
@@ -548,7 +550,8 @@
     [self setLastColumn:column];
 
     [[self tableViewInColumn:column] selectRowIndexes:indexSet byExtendingSelection:NO];
-    [[self window] makeFirstResponder:[self tableViewInColumn:[self lastColumn]]];
+
+    [self setNextResponder:[self tableViewInColumn:[self lastColumn]]];
 
     [self scrollColumnToVisible:column];
 
@@ -562,6 +565,11 @@
     [_contentView setBackgroundColor:aColor];
 }
 
+- (BOOL)acceptsFirstResponder
+{
+    return YES;
+}
+
 // DRAG AND DROP
 
 - (void)registerForDraggedTypes:(CPArray)types
@@ -679,6 +687,17 @@ var _CPBrowserResizeControlBackgroundImage = nil;
     return self;
 }
 
+- (BOOL)acceptsFirstResponder
+{
+    return NO;
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    [super mouseDown:anEvent];
+    [[self window] makeFirstResponder:_browser];
+}
+
 - (CPView)browserView
 {
     return _browser;