diff --git a/ghost/admin/app/components/modal-impersonate-member.js b/ghost/admin/app/components/modal-impersonate-member.js
index b52823c587..4e301a0fd0 100644
--- a/ghost/admin/app/components/modal-impersonate-member.js
+++ b/ghost/admin/app/components/modal-impersonate-member.js
@@ -19,6 +19,11 @@ export default ModalComponent.extend({
         this._signinUrlUpdateTask.perform();
     },
 
+    actions: {
+        // noop - we don't want the enter key doing anything
+        confirm() {}
+    },
+
     copySigninUrl: task(function* () {
         copyTextToClipboard(this.get('signinUrl'));
         yield timeout(1000);
diff --git a/ghost/admin/app/components/modal-markdown-help.js b/ghost/admin/app/components/modal-markdown-help.js
index e083ba9a3c..2ccb30a971 100644
--- a/ghost/admin/app/components/modal-markdown-help.js
+++ b/ghost/admin/app/components/modal-markdown-help.js
@@ -1,4 +1,8 @@
 import ModalComponent from 'ghost-admin/components/modal-base';
 
 export default ModalComponent.extend({
+    actions: {
+        // noop - we don't want the enter key doing anything
+        confirm() {}
+    }
 });
diff --git a/ghost/admin/app/components/modal-member-product.hbs b/ghost/admin/app/components/modal-member-product.hbs
index 40bfffaf4e..01e83f8664 100644
--- a/ghost/admin/app/components/modal-member-product.hbs
+++ b/ghost/admin/app/components/modal-member-product.hbs
@@ -1,14 +1,16 @@
 <header class="modal-header" data-test-modal="delete-user" {{did-insert this.setup}}>
     <h1>Add subscription</h1>
 </header>
-<a class="close" href="" role="button" title="Close" {{action "closeModal" }}>{{svg-jar
-    "close"}}<span class="hidden">Close</span></a>
+<a class="close" href="" role="button" title="Close" {{action "closeModal" }}>
+    {{svg-jar "close"}}<span class="hidden">Close</span>
+</a>
 
 <form>
     <div class="modal-body">
-        <p class="gh-member-addcomp-subhed">Select a product for <strong>{{or
-                this.member.name this.member.email}}</strong>'s complimentary
-            subscription.</p>
+        <p class="gh-member-addcomp-subhed">
+            Select a product for <strong>{{or this.member.name this.member.email}}</strong>'s
+            complimentary subscription.
+        </p>
         {{#if this.activeSubscriptions.length}}
             <p class="gh-member-addcomp-warning">
                 Adding a complimentary subscription cancels all existing subscriptions of this member.
@@ -43,8 +45,7 @@
     <button
         class="gh-btn"
         {{action "closeModal" }}
-        {{!-- disable mouseDown so it does not trigger focus-out validations
-        --}}
+        {{!-- disable mouseDown so it does not trigger focus-out validations --}}
         {{action (optional this.noop) on="mouseDown" }}
         data-test-button="cancel-webhook">
         <span>Cancel</span>
diff --git a/ghost/admin/app/components/modal-member-product.js b/ghost/admin/app/components/modal-member-product.js
index 75e533f50a..8581035d22 100644
--- a/ghost/admin/app/components/modal-member-product.js
+++ b/ghost/admin/app/components/modal-member-product.js
@@ -5,29 +5,15 @@ import {task} from 'ember-concurrency-decorators';
 import {tracked} from '@glimmer/tracking';
 
 export default class ModalMemberProduct extends ModalComponent {
-    @service
-    store
+    @service store;
+    @service ghostPaths;
+    @service ajax;
 
-    @service
-    ghostPaths
-
-    @service
-    ajax
-
-    @tracked
-    price
-
-    @tracked
-    product
-
-    @tracked
-    products = []
-
-    @tracked
-    selectedProduct = null;
-
-    @tracked
-    loadingProducts = false;
+    @tracked price;
+    @tracked product;
+    @tracked products = [];
+    @tracked selectedProduct = null;
+    @tracked loadingProducts = false;
 
     @task({drop: true})
     *fetchProducts() {
@@ -69,9 +55,12 @@ export default class ModalMemberProduct extends ModalComponent {
         this.price = price;
     }
 
-    @task({
-        drop: true
-    })
+    @action
+    confirm() {
+        return this.addProduct.perform();
+    }
+
+    @task({drop: true})
     *addProduct() {
         let url = this.ghostPaths.url.api(`members/${this.member.get('id')}`);
         // Cancel existing active subscriptions for member
diff --git a/ghost/admin/app/components/modal-members-label-form.js b/ghost/admin/app/components/modal-members-label-form.js
index 16155b226f..4eb232b91d 100644
--- a/ghost/admin/app/components/modal-members-label-form.js
+++ b/ghost/admin/app/components/modal-members-label-form.js
@@ -24,8 +24,13 @@ export default ModalComponent.extend({
             this.label.rollbackAttributes();
             this.set('showDeleteLabelModal', true);
         },
+
         validate(property) {
             return this.label.validate({property});
+        },
+
+        confirm() {
+            return this.saveTask.perform();
         }
     },
 
diff --git a/ghost/admin/app/components/modal-post-email-preview.js b/ghost/admin/app/components/modal-post-email-preview.js
index b2f8fba86b..5144b75273 100644
--- a/ghost/admin/app/components/modal-post-email-preview.js
+++ b/ghost/admin/app/components/modal-post-email-preview.js
@@ -30,7 +30,10 @@ export default ModalComponent.extend({
     actions: {
         changeType(type) {
             this.set('type', type);
-        }
+        },
+
+        // noop - we don't want the enter key to do anything here
+        confirm() {}
     },
 
     renderEmailPreview: action(async function renderEmailPreview(iframe) {
diff --git a/ghost/admin/app/components/modal-regenerate-key.js b/ghost/admin/app/components/modal-regenerate-key.js
index 0ce783e5f5..e9b8a4f7cf 100644
--- a/ghost/admin/app/components/modal-regenerate-key.js
+++ b/ghost/admin/app/components/modal-regenerate-key.js
@@ -8,17 +8,22 @@ export default ModalComponent.extend({
     ajax: service(),
     store: service(),
     ghostPaths: service(),
+
     errorMessage: null,
+
     // Allowed actions
     confirm: () => {},
+
     apiKey: alias('model.apiKey'),
     integration: alias('model.integration'),
     internalIntegration: alias('model.internalIntegration'),
+
     actions: {
         confirm() {
             this.regenerateApiKey.perform();
         }
     },
+
     regenerateKey: task(function* () {
         let url = this.get('ghostPaths.url').api('/integrations/', this.integration.id, 'api_key', this.apiKey.id, 'refresh');
         try {
diff --git a/ghost/admin/app/components/modal-stripe-connect.hbs b/ghost/admin/app/components/modal-stripe-connect.hbs
index b00d6761a7..a5e3c05351 100644
--- a/ghost/admin/app/components/modal-stripe-connect.hbs
+++ b/ghost/admin/app/components/modal-stripe-connect.hbs
@@ -21,7 +21,7 @@
             class="gh-btn gh-btn-black"
             {{action "closeModal"}}
             {{action (optional this.noop) on="mouseDown"}}
-            data-test-button="cancel-webhook"
+            data-test-button="stripe-connect-ok"
         >
             <span>OK</span>
         </button>
diff --git a/ghost/admin/app/components/modal-stripe-connect.js b/ghost/admin/app/components/modal-stripe-connect.js
index 21736ab7ea..960b168f0a 100644
--- a/ghost/admin/app/components/modal-stripe-connect.js
+++ b/ghost/admin/app/components/modal-stripe-connect.js
@@ -32,4 +32,14 @@ export default class ModalStripeConnect extends ModalBase {
             }
         }
     }
+
+    actions = {
+        confirm() {
+            if (this.settings.get('stripeConnectAccountId')) {
+                return this.send('closeModal');
+            }
+
+            // noop - enter key shouldn't do anything
+        }
+    }
 }
diff --git a/ghost/admin/app/components/modal-theme-warnings.js b/ghost/admin/app/components/modal-theme-warnings.js
index 0a81100fa5..87e743a557 100644
--- a/ghost/admin/app/components/modal-theme-warnings.js
+++ b/ghost/admin/app/components/modal-theme-warnings.js
@@ -9,5 +9,11 @@ export default ModalComponent.extend({
     warnings: reads('model.warnings'),
     errors: reads('model.errors'),
     fatalErrors: reads('model.fatalErrors'),
-    canActivate: reads('model.canActivate')
+    canActivate: reads('model.canActivate'),
+
+    actions: {
+        confirm() {
+            this.send('closeModal');
+        }
+    }
 });
diff --git a/ghost/admin/app/components/modal-upgrade-custom-integrations-host-limit.js b/ghost/admin/app/components/modal-upgrade-custom-integrations-host-limit.js
index 11f1e858c2..99c3e17ee7 100644
--- a/ghost/admin/app/components/modal-upgrade-custom-integrations-host-limit.js
+++ b/ghost/admin/app/components/modal-upgrade-custom-integrations-host-limit.js
@@ -5,8 +5,12 @@ export default ModalComponent.extend({
     router: service(),
 
     actions: {
-        upgrade: function () {
+        upgrade() {
             this.router.transitionTo('pro');
+        },
+
+        confirm() {
+            this.send('upgrade');
         }
     }
 });
diff --git a/ghost/admin/app/components/modal-upgrade-host-limit-custom-theme.js b/ghost/admin/app/components/modal-upgrade-host-limit-custom-theme.js
index 11f1e858c2..99c3e17ee7 100644
--- a/ghost/admin/app/components/modal-upgrade-host-limit-custom-theme.js
+++ b/ghost/admin/app/components/modal-upgrade-host-limit-custom-theme.js
@@ -5,8 +5,12 @@ export default ModalComponent.extend({
     router: service(),
 
     actions: {
-        upgrade: function () {
+        upgrade() {
             this.router.transitionTo('pro');
+        },
+
+        confirm() {
+            this.send('upgrade');
         }
     }
 });
diff --git a/ghost/admin/app/components/modal-upgrade-host-limit.js b/ghost/admin/app/components/modal-upgrade-host-limit.js
index 8dee14ae98..0be3f8c190 100644
--- a/ghost/admin/app/components/modal-upgrade-host-limit.js
+++ b/ghost/admin/app/components/modal-upgrade-host-limit.js
@@ -11,9 +11,14 @@ export default ModalComponent.extend({
 
         return {limit, total, message};
     }),
+
     actions: {
-        upgrade: function () {
+        upgrade() {
             this.router.transitionTo('pro');
+        },
+
+        confirm() {
+            this.send('upgrade');
         }
     }
 });
diff --git a/ghost/admin/app/components/modal-upgrade-unsuspend-user-host-limit.js b/ghost/admin/app/components/modal-upgrade-unsuspend-user-host-limit.js
index 11f1e858c2..99c3e17ee7 100644
--- a/ghost/admin/app/components/modal-upgrade-unsuspend-user-host-limit.js
+++ b/ghost/admin/app/components/modal-upgrade-unsuspend-user-host-limit.js
@@ -5,8 +5,12 @@ export default ModalComponent.extend({
     router: service(),
 
     actions: {
-        upgrade: function () {
+        upgrade() {
             this.router.transitionTo('pro');
+        },
+
+        confirm() {
+            this.send('upgrade');
         }
     }
 });
diff --git a/ghost/admin/app/components/modal-whats-new.js b/ghost/admin/app/components/modal-whats-new.js
index e1dde58d78..563ad0bff5 100644
--- a/ghost/admin/app/components/modal-whats-new.js
+++ b/ghost/admin/app/components/modal-whats-new.js
@@ -4,5 +4,10 @@ import {inject as service} from '@ember/service';
 export default ModalComponent.extend({
     whatsNew: service(),
 
-    confirm() {}
+    confirm() {},
+
+    actions: {
+        // noop - enter key shouldn't do anything
+        confirm() {}
+    }
 });