diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index be37a903..6bac461b 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.js b/scripts/pi-hole/js/groups.js
index e37e3a9b..8f21d460 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);
       }