diff --git a/VDS/Components/TextFields/InputField/InputField.swift b/VDS/Components/TextFields/InputField/InputField.swift
index e1609f96..fd36ecac 100644
--- a/VDS/Components/TextFields/InputField/InputField.swift
+++ b/VDS/Components/TextFields/InputField/InputField.swift
@@ -364,11 +364,11 @@ extension InputField: UITextFieldDelegate {
     
     open func textFieldDidChangeSelection(_ textField: UITextField) {
         fieldType.handler().textFieldDidChangeSelection(self, textField: textField)
+        text = textField.text
+        sendActions(for: .valueChanged)
         if fieldType.handler().validateOnChange {
             validate()
         }
-        sendActions(for: .valueChanged)
-        setNeedsUpdate()
     }
     
     open func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {