diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index 9db2ce54a..7d15a7e89 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -409,13 +409,11 @@ var _CPTextFieldSquareBezelColor    = nil;
 }
 
 - (void)mouseUp:(CPEvent)anEvent
-{
-    return;
-    
-    if (_isEditable)
+{    
+    if (_isEditable && [[self window] firstResponder] == self)
         return;
         
-    [super mouseDown:anEvent];
+    [super mouseUp:anEvent];
 }
 
 /*