diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index 5451244fa..430762de0 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -453,6 +453,9 @@ CPTextFieldStatePlaceholder = 1 << 13;
 /* @ignore */
 - (BOOL)becomeFirstResponder
 {
+    if (CPTextFieldInputOwner && [CPTextFieldInputOwner window] !== [self window])
+        [[CPTextFieldInputOwner window] makeFirstResponder:nil];
+
     _controlState |= CPControlStateEditing;
 
     [self _updatePlaceholderState];