diff --git a/src/dialog/Dialog.js b/src/dialog/Dialog.js
index a29424b2e..7b0d2d3fd 100644
--- a/src/dialog/Dialog.js
+++ b/src/dialog/Dialog.js
@@ -55,10 +55,12 @@ export default createComponent({
       if (this.beforeClose) {
         this.loading[action] = true;
         this.beforeClose(action, state => {
-          if (state !== false) {
+          if (state !== false && this.loading[action]) {
             this.onClose(action);
           }
-          this.loading[action] = false;
+
+          this.loading.confirm = false;
+          this.loading.cancel = false;
         });
       } else {
         this.onClose(action);