diff --git a/src/Modal/Modal.svelte b/src/Modal/Modal.svelte
index 522a7ec7..30259344 100644
--- a/src/Modal/Modal.svelte
+++ b/src/Modal/Modal.svelte
@@ -168,7 +168,11 @@
 
         tabbable[index].focus();
         e.preventDefault();
-      } else if (shouldSubmitOnEnter && e.key === 'Enter') {
+      } else if (
+        shouldSubmitOnEnter &&
+        e.key === 'Enter' &&
+        !primaryButtonDisabled
+      ) {
         dispatch('submit');
         dispatch('click:button--primary');
       }