diff --git a/AppKit/CPDatePicker/CPDatePicker.j b/AppKit/CPDatePicker/CPDatePicker.j
index 922e8cbd9..5a4f81727 100644
--- a/AppKit/CPDatePicker/CPDatePicker.j
+++ b/AppKit/CPDatePicker/CPDatePicker.j
@@ -533,7 +533,7 @@ CPEraDatePickerElementFlag              = 0x0100;
 {
     if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
     {
-        if ([super becomeFirstResponder])
+        if (![super becomeFirstResponder])
             return NO;
 
         [_datePickerTextfield _selecteTextFieldWithFlags:[[CPApp currentEvent] modifierFlags]];
diff --git a/AppKit/CPDatePicker/_CPDatePickerTextField.j b/AppKit/CPDatePicker/_CPDatePickerTextField.j
index 02c7a7148..ddd6e3172 100644
--- a/AppKit/CPDatePicker/_CPDatePickerTextField.j
+++ b/AppKit/CPDatePicker/_CPDatePickerTextField.j
@@ -1226,14 +1226,14 @@ var CPMonthDateType = 0,
     CPTimer _timerEdition;
 }
 
-
-#pragma mark -
-#pragma mark Getter Setter methods
-
-- (BOOL)acceptFirstResponder
+- (id)init
 {
-    _firstEvent = YES;
-    return NO;
+    if (self = [super init])
+    {
+        _firstEvent = YES;
+    }
+
+    return self;
 }
 
 /*! Set the dateType of the textField