diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index 07d52f7dd..90b0468f0 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -613,10 +613,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 /* @ignore */
 - (BOOL)resignFirstResponder
 {
-    // When we are no longer the first responder we don't worry about the key status of our window anymore.
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidResignKeyNotification object:[self window]];
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidBecomeKeyNotification object:[self window]];
-
 #if PLATFORM(DOM)
 
     var element = [self _inputElement],
@@ -638,6 +634,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 #endif
 
+    // When we are no longer the first responder we don't worry about the key status of our window anymore.
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidResignKeyNotification object:[self window]];
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidBecomeKeyNotification object:[self window]];
+
     [self _resignFirstKeyResponder];
 
     _isEditing = NO;