diff --git a/Layout/default/Domain/Index.php b/Layout/default/Domain/Index.php
index 732225bd4..60986dc24 100644
--- a/Layout/default/Domain/Index.php
+++ b/Layout/default/Domain/Index.php
@@ -96,9 +96,9 @@ include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php")
     </tt-table>
 
     <!-- Bootstrap Modal to query and show all DNS records for a domain -->
-    <div class="modal show d-block" tabindex="-1" role="dialog" style="background: rgba(0, 0, 0, 0.5);"
+    <div class="modal show d-block" tabindex="-1" role="dialog" style="background: rgba(0, 0, 0, 0.5);" ref="dnsRecordsModal" @click="dnsRecordsModal.domain = null" @keydown.esc="dnsRecordsModal.domain = null"
          v-if="dnsRecordsModal.domain">
-        <div class="modal-dialog" role="document" style="max-width: fit-content">
+        <div class="modal-dialog" role="document" style="max-width: fit-content" @click.stop>
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title">DNS Records for {{ dnsRecordsModal.domain ?? '' }}</h5>
@@ -213,6 +213,9 @@ include(realpath(dirname(__FILE__) . "/../../$mfLayoutPackage") . "/header.php")
                     return record
                 })
                 this.dnsRecordsModalLoading = null
+                this.$nextTick(() => {
+                    this.$refs.dnsRecordsModal.focus()
+                })
             },
             async fetchDomainContacts() {
                 const response = await axios.get(window['TT_CONFIG']['DOMAIN_API_URL'] + '?do=getDomainContacts')