diff --git a/AppKit/CPWindow/CPWindow.j b/AppKit/CPWindow/CPWindow.j
index f3b93531f..6991f5781 100644
--- a/AppKit/CPWindow/CPWindow.j
+++ b/AppKit/CPWindow/CPWindow.j
@@ -857,12 +857,12 @@ CPTexturedBackgroundWindowMask
     [_platformWindow order:CPWindowAbove window:self relativeTo:nil];
 #endif
 
-    if (_firstResponder === self || !_firstResponder)
-        [self makeFirstResponder:_initialFirstResponder];
-
     if (!CPApp._keyWindow)
         [self makeKeyWindow];
 
+    if ([self isKeyWindow] && (_firstResponder === self || !_firstResponder))
+        [self makeFirstResponder:_initialFirstResponder];
+
     if (!CPApp._mainWindow)
         [self makeMainWindow];
 }