diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java
index 87218b628..ab7911f16 100644
--- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java
+++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractMaskedInputWidget.java
@@ -188,6 +188,9 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
         @Override
         public void afterTextChanged(Editable s) {
+            if (mEditText.hasFocus()) {
+                isEdited = true;
+            }
         }
 
         @Override
@@ -233,6 +236,9 @@ public void afterTextChanged(Editable s) {
                     mEditText.addTextChangedListener(this);
                 }
             }
+            if (mEditText.hasFocus()) {
+                isEdited = true;
+            }
         }
 
         /*
diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java
index 0e9cb8311..7918bcf82 100644
--- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java
+++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/AbstractWidget.java
@@ -39,7 +39,7 @@ public abstract class AbstractWidget {
     public boolean isEdited = false;
 
     public AbstractWidget(@Nullable Field field, @NonNull WidgetEventListener listener,
-            @Nullable String defaultValue, @NonNull View defaultFocusView) {
+                          @Nullable String defaultValue, @NonNull View defaultFocusView) {
         mField = field;
         mListener = listener;
         mDefaultValue = defaultValue;
@@ -64,8 +64,7 @@ public void showValidationError() {
     public boolean isValid() {
         if (mField == null) {
             return true;
-        }
-        else if(!isEdited && mField.isFieldValueMasked()) {
+        } else if (!isEdited && mField.isFieldValueMasked()) {
             return true;
         }
         return !isInvalidEmptyValue() && !isInvalidLength() && !isInvalidRegex();
diff --git a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java
index b5de70604..08031417e 100644
--- a/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java
+++ b/transfermethodui/src/main/java/com/hyperwallet/android/ui/transfermethod/view/widget/ExpiryDateWidget.java
@@ -178,6 +178,9 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
 
                 @Override
                 public void afterTextChanged(Editable s) {
+                    if (editText.hasFocus()) {
+                        isEdited = true;
+                    }
                 }
             });