diff --git a/app/webpacker/controllers/mixins/useOpenAndCloseAsAModal.js b/app/webpacker/controllers/mixins/useOpenAndCloseAsAModal.js
index 7648563791..45c67dc38d 100644
--- a/app/webpacker/controllers/mixins/useOpenAndCloseAsAModal.js
+++ b/app/webpacker/controllers/mixins/useOpenAndCloseAsAModal.js
@@ -12,8 +12,8 @@ export const useOpenAndCloseAsAModal = (controller) => {
     }.bind(controller),
 
     close: function (_event, remove = false) {
-      // Only execute close if there is an open modal
-      if (!document.querySelector("body").classList.contains('modal-open')) return;
+      // Only execute close if the current modal is open
+      if (!this.modalTarget.classList.contains('in')) return;
 
       this.modalTarget.classList.remove("in");
       this.backgroundTarget.classList.remove("in");