diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/BaseDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/BaseDropdownEntryField.swift
index 2076d0fc..38da2bdb 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/BaseDropdownEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/BaseDropdownEntryField.swift
@@ -86,6 +86,11 @@ import UIKit
         dropDownCaretView.setOptional(with: model.caretView, delegateObject, additionalData)
     }
     
+    public override func dismissFieldInput(_ sender: Any?) {
+         performDropdownAction()
+         super.dismissFieldInput(sender)
+     }
+    
     func performDropdownAction() {
         if let actionModel = baseDropdownEntryFieldModel?.action, let actionMap = actionModel.toJSON() {
             var additionalData = self.additionalData ?? [:]
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DateDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DateDropdownEntryField.swift
index b8fba094..6ff950f6 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DateDropdownEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DateDropdownEntryField.swift
@@ -106,7 +106,6 @@ import UIKit
     @objc public override func dismissFieldInput(_ sender: Any?) {
         
         setTextWith(date: datePicker?.date)
-        performDropdownAction()
         super.dismissFieldInput(sender)
     }
     
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryField.swift
index 6c2a0f4e..ddc459c3 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryField.swift
@@ -32,8 +32,6 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
         return model as? ItemDropdownEntryFieldModel
     }
     
-    private var systemWillSetItem = false
-    
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
@@ -112,9 +110,7 @@ open class ItemDropdownEntryField: BaseDropdownEntryField {
         setPickerDelegates(delegate: self)
         
         if let pickerView = pickerView, let index = model.selectedIndex {
-            systemWillSetItem = true
             self.pickerView(pickerView, didSelectRow: index, inComponent: 0)
-            systemWillSetItem = false
         }
     }
 }
@@ -142,9 +138,6 @@ extension ItemDropdownEntryField: UIPickerViewDelegate, UIPickerViewDataSource {
         observeDropdownChange?(text ?? "", pickerData[row])
         text = pickerData[row]
         itemDropdownEntryFieldModel?.selectedIndex = row
-        if !systemWillSetItem {
-            performDropdownAction()
-        }
     }
 }