diff --git a/js/src/modal.js b/js/src/modal.js
index b44cbb94d9..33e525d235 100644
--- a/js/src/modal.js
+++ b/js/src/modal.js
@@ -139,13 +139,17 @@ class Modal extends BaseComponent {
   }
 
   dispose() {
-    EventHandler.off(window, EVENT_KEY)
-    EventHandler.off(this._dialog, EVENT_KEY)
+    this._element.addEventListener(EVENT_HIDDEN, () => {
+      EventHandler.off(window, EVENT_KEY)
+      EventHandler.off(this._dialog, EVENT_KEY)
 
-    this._backdrop.dispose()
-    this._focustrap.deactivate()
+      this._backdrop.dispose()
+      this._focustrap.deactivate()
 
-    super.dispose()
+      super.dispose()
+    })
+
+    this._hideModal()
   }
 
   handleUpdate() {