diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
index 6bb82fe1..b1a3e43e 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryField.swift
@@ -257,11 +257,13 @@ import UIKit
         if let isLocked = model.locked {
             self.isLocked = isLocked
             
-        } else if let isSelected = model.selected {
-            self.isSelected = isSelected
+        } else if (model.selected ?? false) && !model.wasInitiallySelected {
+            
+            model.wasInitiallySelected = true
+            self.isSelected = true
         }
     }
-
+    
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 115
     }
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
index 337d847d..9be330a3 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/EntryFieldModel.swift
@@ -30,6 +30,7 @@ import Foundation
     public var fieldKey: String?
     public var groupName: String = FormValidator.defaultGroupName
     public var baseValue: AnyHashable?
+    public var wasInitiallySelected: Bool = false
     
     public var isValid: Bool? {
         didSet { updateUI?() }
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
index 27ecf3ad..57c9dae9 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryField.swift
@@ -340,8 +340,7 @@ import UIKit
         observingTextFieldDelegate = delegateObject?.observingTextFieldDelegate
         setupTextFieldToolbar()
         
-        if isSelected && !model.wasInitiallySelected {
-            textEntryFieldModel?.wasInitiallySelected = true
+        if isSelected {
             startEditing()
         }
     }
diff --git a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
index 46d84484..491e9891 100644
--- a/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/TextFields/TextEntryFieldModel.swift
@@ -31,7 +31,6 @@
     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