diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js
index 1e91b17c0b..c856f0b487 100644
--- a/public/src/admin/manage/group.js
+++ b/public/src/admin/manage/group.js
@@ -88,7 +88,7 @@ define('admin/manage/group', [
 			bootbox.confirm('[[admin/manage/groups:alerts.confirm-delete]]', function (confirm) {
 				if (confirm) {
 					api.del(`/groups/${slugify(ajaxify.data.group.name)}`, {}).then(() => {
-						ajaxify.go('/admin/managegroups');
+						ajaxify.go('/admin/manage/groups');
 					}).catch(alerts.error);
 				}
 			});
diff --git a/public/src/admin/manage/groups.js b/public/src/admin/manage/groups.js
index ba3d11f258..a12881af26 100644
--- a/public/src/admin/manage/groups.js
+++ b/public/src/admin/manage/groups.js
@@ -40,7 +40,6 @@ define('admin/manage/groups', [
 					const createModal = $('#create-modal');
 					const createGroupName = $('#create-group-name');
 					const createModalGo = $('#create-modal-go');
-					const createModalError = $('#create-modal-error');
 
 					createGroupName.trigger('focus');
 					createModal.on('keypress', function (e) {
@@ -61,18 +60,12 @@ define('admin/manage/groups', [
 						};
 
 						api.post('/groups', submitObj).then((response) => {
-							createModalError.addClass('hide');
 							createGroupName.val('');
 							createModal.on('hidden.bs.modal', function () {
 								ajaxify.go('admin/manage/groups/' + response.name);
 							});
 							createModal.modal('hide');
-						}).catch((err) => {
-							if (!utils.hasLanguageKey(err.status.message)) {
-								err.status.message = '[[admin/manage/groups:alerts.create-failure]]';
-							}
-							createModalError.translateHtml(err.status.message).removeClass('hide');
-						});
+						}).catch(alerts.error);
 					});
 				});
 			});
diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js
index bd13996044..946de7faac 100644
--- a/public/src/client/groups/list.js
+++ b/public/src/client/groups/list.js
@@ -8,13 +8,16 @@ define('forum/groups/list', [
 	Groups.init = function () {
 		// Group creation
 		$('button[data-action="new"]').on('click', function () {
-			bootbox.prompt('[[groups:new-group.group-name]]', function (name) {
-				if (name && name.length) {
-					api.post('/groups', {
-						name: name,
-					}).then((res) => {
+			const modal = bootbox.prompt('[[groups:new-group.group-name]]', function (name) {
+				if (name === '') {
+					return false;
+				}
+				if (name && name.trim().length) {
+					api.post('/groups', { name }).then((res) => {
+						modal.modal('hide');
 						ajaxify.go('groups/' + res.slug);
 					}).catch(alerts.error);
+					return false;
 				}
 			});
 		});
diff --git a/src/views/admin/partials/create_group_modal.tpl b/src/views/admin/partials/create_group_modal.tpl
index 49ee2678fd..51554b6064 100644
--- a/src/views/admin/partials/create_group_modal.tpl
+++ b/src/views/admin/partials/create_group_modal.tpl
@@ -6,7 +6,6 @@
 				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-hidden="true"></button>
 			</div>
 			<div class="modal-body">
-				<div class="alert alert-danger hide" id="create-modal-error"></div>
 				<form>
 					<div class="mb-3">
 						<label class="form-label" for="create-group-name">[[admin/manage/groups:name]]</label>