diff --git a/framework/core/js/src/common/components/Modal.js b/framework/core/js/src/common/components/Modal.js
index b554b255e..2a59beb01 100644
--- a/framework/core/js/src/common/components/Modal.js
+++ b/framework/core/js/src/common/components/Modal.js
@@ -27,6 +27,10 @@ export default class Modal extends Component {
     this.attrs.onshow(() => this.onready());
   }
 
+  onremove() {
+    this.attrs.onhide();
+  }
+
   view() {
     if (this.alertAttrs) {
       this.alertAttrs.dismissible = false;
diff --git a/framework/core/js/src/common/components/ModalManager.js b/framework/core/js/src/common/components/ModalManager.js
index 8d13fe434..35922f70d 100644
--- a/framework/core/js/src/common/components/ModalManager.js
+++ b/framework/core/js/src/common/components/ModalManager.js
@@ -16,12 +16,6 @@ export default class ModalManager extends Component {
     );
   }
 
-  onupdate() {
-    if (this.$('.Modal') && !this.attrs.state.modal) {
-      this.animateHide();
-    }
-  }
-
   oncreate(vnode) {
     super.oncreate(vnode);