diff --git a/ghost/admin/app/components/members/modals/bulk-add-label.hbs b/ghost/admin/app/components/members/modals/bulk-add-label.hbs
index 87eee95f02..c8d0bd4113 100644
--- a/ghost/admin/app/components/members/modals/bulk-add-label.hbs
+++ b/ghost/admin/app/components/members/modals/bulk-add-label.hbs
@@ -2,7 +2,7 @@
     <header class="modal-header" data-test-modal="add-label-members">
         <h1>Add Label</h1>
     </header>
-    <a class="close" href="" role="button" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
+    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
 
     {{#if this.hasRun}}
         <div class="gh-content-box pa" data-test-state="add-complete">
diff --git a/ghost/admin/app/components/members/modals/bulk-remove-label.hbs b/ghost/admin/app/components/members/modals/bulk-remove-label.hbs
index 2170cf11db..6e484af02d 100644
--- a/ghost/admin/app/components/members/modals/bulk-remove-label.hbs
+++ b/ghost/admin/app/components/members/modals/bulk-remove-label.hbs
@@ -2,7 +2,7 @@
     <header class="modal-header" data-test-modal="remove-label-members">
         <h1>Remove Label</h1>
     </header>
-    <a class="close" href="" role="button" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
+    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
 
     {{#if this.hasRun}}
         <div class="gh-content-box pa" data-test-state="remove-complete">
diff --git a/ghost/admin/app/components/members/modals/bulk-unsubscribe.hbs b/ghost/admin/app/components/members/modals/bulk-unsubscribe.hbs
index 73ab8cebeb..2fe6418472 100644
--- a/ghost/admin/app/components/members/modals/bulk-unsubscribe.hbs
+++ b/ghost/admin/app/components/members/modals/bulk-unsubscribe.hbs
@@ -2,7 +2,7 @@
     <header class="modal-header" data-test-modal="unsubscribe-members">
         <h1>Unsubscribe members from email?</h1>
     </header>
-    <a class="close" href="" role="button" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
+    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
 
     {{#if this.hasRun}}
         <div class="gh-content-box pa" data-test-state="unsubscribe-complete">
diff --git a/ghost/admin/app/components/settings/integrations/delete-webhook-modal.hbs b/ghost/admin/app/components/settings/integrations/delete-webhook-modal.hbs
index 7f1b797923..b265a829dd 100644
--- a/ghost/admin/app/components/settings/integrations/delete-webhook-modal.hbs
+++ b/ghost/admin/app/components/settings/integrations/delete-webhook-modal.hbs
@@ -2,7 +2,7 @@
     <header class="modal-header">
         <h1>Are you sure?</h1>
     </header>
-    <a class="close" href="" role="button" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></a>
+    <button type="button" class="close" title="Close" {{on "click" @close}}>{{svg-jar "close"}}<span class="hidden">Close</span></button>
 
     <div class="modal-body">
         <p>