diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index d3dca7380..0d8576a45 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -882,7 +882,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     [super _addObservers];
 
-    if ([self window] === self)
+    if ([[self window] firstResponder] === self)
         [self _setObserveWindowKeyNotifications:YES];
 }