diff --git a/AppKit/CPWindow/CPWindow.j b/AppKit/CPWindow/CPWindow.j
index 1796b6568..4cafc4808 100644
--- a/AppKit/CPWindow/CPWindow.j
+++ b/AppKit/CPWindow/CPWindow.j
@@ -257,6 +257,7 @@ var CPWindowSaveImage       = nil,
 
     CPToolbar                   _toolbar;
     CPResponder                 _firstResponder;
+    CPResponder                 _initialFirstResponder;
     id                          _delegate;
 
     CPString                    _title;
@@ -434,6 +435,12 @@ CPTexturedBackgroundWindowMask
     return _CPBorderlessBridgeWindowView;
 }
 
+- (void)awakeFromCib
+{
+    if (_initialFirstResponder)
+        [self makeFirstResponder:_initialFirstResponder];
+}
+
 - (void)_setWindowView:(CPView)aWindowView
 {
     if (_windowView === aWindowView)