diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index f95c918d..3dd2337b 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -308,13 +308,13 @@ import UIKit
         guard let model = model as? TextEntryFieldModel else { return }
         
         model.updateUI = { [weak self] in
-            MVMCoreDispatchUtility.performBlock(onMainThread: {
+            DispatchQueue.main.async {
                 guard let self = self else { return }
                 
                 if self.isSelected {
                     self.updateValidation(model.isValid ?? true)
                 }
-            })
+            }
         }
         
         self.delegateObject = delegateObject
@@ -339,6 +339,11 @@ import UIKit
         uiTextFieldDelegate = delegateObject?.uiTextFieldDelegate
         observingTextFieldDelegate = delegateObject?.observingTextFieldDelegate
         setupTextFieldToolbar()
+        
+        if isSelected && !model.wasInitiallySelected {
+            textEntryFieldModel?.wasInitiallySelected = true
+            startEditing()
+        }
     }
 }
 
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
index 491e9891..46d84484 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
@@ -31,6 +31,7 @@
     public var enabledTextColor: Color = Color(uiColor: .mvmBlack)
     public var disabledTextColor: Color = Color(uiColor: .mvmCoolGray3)
     public var type: EntryType?
+    public var wasInitiallySelected: Bool = false
     
     //--------------------------------------------------
     // MARK: - Keys