diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 3ac8d3f36e..d939f0d3ad 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -75,7 +75,7 @@ $(document).ready( function () {
 			if (e.target.id !== 'newgroup-form') {
 				$("#newgroup-form").hide();
 				$("#newgroup-init").show();
-			}			
+			}
 		});
 	});
 
@@ -120,6 +120,16 @@ $(document).ready( function () {
 			}
 		)
 	});
+
+	// click on group name
+	// FIXME: also triggered when clicking on "remove"
+	$('ul').on('click', 'li[data-gid]', function (event) {
+		var li = $(this);
+		var gid = $(li).attr('data-gid');
+		// Call function for handling delete/undo on Groups
+		GroupList.showGroup(gid);
+	});
+
 	// Implements Groupname editing.
 	$('#app-navigation').on('click', 'img.rename', function (event) {
 		event.stopPropagation();
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index e82a6ceac1..e939d1d3bf 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -503,15 +503,6 @@ $(document).ready(function () {
 		});
 	});
 
-	// click on group name
-	// FIXME: also triggered when clicking on "remove"
-	$('ul').on('click', 'li', function (event) {
-		var li = $(this);
-		var gid = $(li).attr('data-gid');
-		// Call function for handling delete/undo on Groups
-		GroupList.showGroup(gid);
-	});
-
 	$('#newuser').submit(function (event) {
 		event.preventDefault();
 		var username = $('#newusername').val();
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 620049eb29..6acf12a952 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -12,7 +12,7 @@
 		</form>
 	</li>
 	<!-- Everyone -->
-	<li>
+	<li data-gid="">
 		<a href="#">
 			<span>
 				<?php p($l->t('Everyone')); ?>