diff --git a/js/src/common/components/ModalManager.js b/js/src/common/components/ModalManager.js
index b357e938e..8a36d7bba 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(vnode) {
+    if (this.$('Modal') && !this.attrs.state.modal) {
+      this.animateHide();
+    }
+  }
+
   oncreate(vnode) {
     super.oncreate(vnode);