diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift
index 5a7f1702..d9b42a41 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift	
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/BaseDropdownEntryField.swift	
@@ -88,14 +88,18 @@ import UIKit
     }
     
     @objc public override func dismissFieldInput(_ sender: Any?) {
-        performDropdownAction()
+        if !textField.isFirstResponder {
+            performDropdownAction()
+        }
         super.dismissFieldInput(sender)
     }
     
     func performDropdownAction() {
-        if let baseDropdownEntryFieldModel = baseDropdownEntryFieldModel, let actionModel = baseDropdownEntryFieldModel.action {
-            let additionalDataWithSource = additionalData.dictionaryAdding(key: KeySourceModel, value: baseDropdownEntryFieldModel)
-            MVMCoreActionHandler.shared()?.asyncHandleAction(with: actionModel, additionalData: additionalDataWithSource, delegateObject: delegateObject)
-        }
+        guard let baseDropdownEntryFieldModel = baseDropdownEntryFieldModel,
+              let actionModel = baseDropdownEntryFieldModel.action
+        else { return }
+        
+        let additionalDataWithSource = additionalData.dictionaryAdding(key: KeySourceModel, value: baseDropdownEntryFieldModel)
+        MVMCoreActionHandler.shared()?.asyncHandleAction(with: actionModel, additionalData: additionalDataWithSource, delegateObject: delegateObject)
     }
 }
diff --git a/MVMCoreUI/Containers/Views/EntryFieldContainer.swift b/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
index 9ccd1d25..50236e45 100644
--- a/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
+++ b/MVMCoreUI/Containers/Views/EntryFieldContainer.swift
@@ -270,7 +270,9 @@ import UIKit
             bottomBar?.frame = CGRect(x: 0, y: bounds.height - size, width: bounds.width, height: size)
             
             if updateMoleculeLayout || heightChanged {
-                delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
+                DispatchQueue.main.async { [self] in
+                    delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
+                }
             }
             
             setNeedsDisplay()