diff --git a/js/src/common/components/Modal.js b/js/src/common/components/Modal.js
index 2a59beb01..b554b255e 100644
--- a/js/src/common/components/Modal.js
+++ b/js/src/common/components/Modal.js
@@ -27,10 +27,6 @@ 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/js/src/common/components/ModalManager.js b/js/src/common/components/ModalManager.js
index 35922f70d..8d13fe434 100644
--- a/js/src/common/components/ModalManager.js
+++ b/js/src/common/components/ModalManager.js
@@ -16,6 +16,12 @@ export default class ModalManager extends Component {
     );
   }
 
+  onupdate() {
+    if (this.$('.Modal') && !this.attrs.state.modal) {
+      this.animateHide();
+    }
+  }
+
   oncreate(vnode) {
     super.oncreate(vnode);