diff --git a/src/client/components/BaseModal.ts b/src/client/components/BaseModal.ts
index 8efc8e258..b73eb9470 100644
--- a/src/client/components/BaseModal.ts
+++ b/src/client/components/BaseModal.ts
@@ -115,6 +115,7 @@ export abstract class BaseModal extends LitElement {
    * Subclasses can override onOpen() for custom behavior.
    */
   public open(): void {
+    if (this.isModalOpen) return;
     this.registerEscapeHandler();
     this.onOpen();