diff --git a/scripts/pi-hole/js/customcname.js b/scripts/pi-hole/js/customcname.js
index e0f317602..4df7b543f 100644
--- a/scripts/pi-hole/js/customcname.js
+++ b/scripts/pi-hole/js/customcname.js
@@ -92,6 +92,7 @@ function addCustomCNAME() {
         $("#domain").val("");
         $("#target").val("");
         table.ajax.reload();
+        $("#domain").focus();
       } else {
         utils.showAlert("error", "fas fa-times", "Failure! Something went wrong", response.message);
       }
diff --git a/scripts/pi-hole/js/customdns.js b/scripts/pi-hole/js/customdns.js
index b87828835..e8effe261 100644
--- a/scripts/pi-hole/js/customdns.js
+++ b/scripts/pi-hole/js/customdns.js
@@ -86,6 +86,7 @@ function addCustomDNS() {
         $("#domain").val("");
         $("#ip").val("");
         table.ajax.reload();
+        $("#domain").focus();
       } else {
         utils.showAlert("error", "fas fa-times", "Failure! Something went wrong", response.message);
       }
diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index be37a9035..6bac461bc 100644
--- a/scripts/pi-hole/js/groups-adlists.js
+++ b/scripts/pi-hole/js/groups-adlists.js
@@ -517,6 +517,7 @@ function addAdlist() {
         $("#new_comment").val("");
         table.ajax.reload();
         table.rows().deselect();
+        $("#new_address").focus();
       } else {
         utils.showAlert("error", "", "Error while adding new adlist: ", response.message);
       }
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index c0c416981..9eaeecd56 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -545,6 +545,7 @@ function addDomain() {
         wildcardEl.prop("checked", false);
         table.ajax.reload(null, false);
         table.rows().deselect();
+        domainEl.focus();
       } else {
         utils.showAlert("error", "", "Error while adding new " + domainRegex, response.message);
       }
diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js
index e37e3a9b4..8f21d460d 100644
--- a/scripts/pi-hole/js/groups.js
+++ b/scripts/pi-hole/js/groups.js
@@ -288,6 +288,7 @@ function addGroup() {
         $("#new_desc").val("");
         table.ajax.reload();
         table.rows().deselect();
+        $("#new_name").focus();
       } else {
         utils.showAlert("error", "", "Error while adding new group", response.message);
       }