diff --git a/Source/NSTextField.m b/Source/NSTextField.m
index b6c62dee6..0f4482184 100644
--- a/Source/NSTextField.m
+++ b/Source/NSTextField.m
@@ -455,6 +455,8 @@ static Class textFieldCellClass;
 
   [_cell endEditing: [aNotification object]];
 
+  _text_object = nil;
+
   d = [NSDictionary dictionaryWithObject: [aNotification object] 
 		    forKey: @"NSFieldEditor"];
   [nc postNotificationName: NSControlTextDidEndEditingNotification
@@ -487,7 +489,6 @@ static Class textFieldCellClass;
 	  break;
 	}
     }
-  _text_object = nil;
 }
 
 - (BOOL) textShouldBeginEditing: (NSText *)textObject