diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/components/sharedcomponents.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/components/sharedcomponents.js
index dcf08f24d..03622afd8 100644
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/components/sharedcomponents.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customeraddress/components/sharedcomponents.js
@@ -154,6 +154,9 @@ enyo.kind({
       },
       function(args) {
         if (args.cancellation) {
+          me.parent.parent.waterfall('onDisableButton', {
+            disabled: false
+          });
           return;
         }
         if (args.passValidation) {
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/components/sharedcomponents.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/components/sharedcomponents.js
index 1d884da37..b3367d0b9 100644
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/components/sharedcomponents.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/subwindows/customers/components/sharedcomponents.js
@@ -474,6 +474,9 @@ enyo.kind({
       },
       function(args) {
         if (args.cancellation) {
+          me.parent.parent.waterfall('onDisableButton', {
+            disabled: false
+          });
           return;
         }
         if (args.passValidation) {