diff --git a/MVMCoreUI/Atoms/TextFields/DateDropdownEntryField.swift b/MVMCoreUI/Atoms/TextFields/DateDropdownEntryField.swift
index e083eadc..0a9952ed 100644
--- a/MVMCoreUI/Atoms/TextFields/DateDropdownEntryField.swift
+++ b/MVMCoreUI/Atoms/TextFields/DateDropdownEntryField.swift
@@ -59,9 +59,10 @@ open class DateDropdownEntryField: DropdownEntryField {
     private func setup() {
         
         datePicker = MVMCoreUICommonViewsUtility.addDatePicker(to: textField)
-        datePicker?.addTarget(self, action: #selector(valueChanged(_:)), for: .valueChanged)
+        datePicker?.addTarget(self, action: #selector(pickerValueChanged), for: .valueChanged)
         datePicker?.timeZone = NSTimeZone.system
         MVMCoreUICommonViewsUtility.addDismissToolbar(textField, delegate: self)
+        uiTextFieldDelegate = self
     }
 
     //--------------------------------------------------
@@ -103,7 +104,7 @@ open class DateDropdownEntryField: DropdownEntryField {
         super.dismissFieldInput(sender)
     }
     
-    @objc func valueChanged(_ sender: UIDatePicker){
+    @objc func pickerValueChanged(_ sender: UIDatePicker){
        
         setTextWith(date: datePicker?.date)
     }
@@ -114,7 +115,7 @@ extension DateDropdownEntryField {
     
     public func textFieldDidBeginEditing(_ textField: UITextField) {
         
-//        setInitialValueFromPicker()
+        isSelected = true
         proprietorTextDelegate?.textFieldDidBeginEditing?(textField)
     }
 }
@@ -126,7 +127,5 @@ extension DateDropdownEntryField {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
         
         guard let dictionary = json, !dictionary.isEmpty else { return }
-        
-        
     }
 }