diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 5a337c3855..0b94401941 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -940,7 +940,7 @@ $(document).ready(function () {
 		UserList._triggerGroupEdit($td, isSubadminSelect);
 	});
 
-	$userListBody.on('click', '.toggleUserActions', function (event) {
+	$userListBody.on('click', '.toggleUserActions > .action', function (event) {
 		event.stopPropagation();
 		var $td = $(this).closest('td');
 		var $tr = $($td).closest('tr');
@@ -963,9 +963,11 @@ $(document).ready(function () {
 		$tr.addClass('active');
 	});
 
-	$(document).on('mouseup', function () {
-		$('#userlist tr.active').removeClass('active');
-		$('#userlist .popovermenu.open').removeClass('open');
+	$(document).on('mouseup', function (event) {
+		if (!$(event.target).closest('.toggleUserActions').length) {
+			$('#userlist tr.active').removeClass('active');
+			$('#userlist .popovermenu.open').removeClass('open');
+		}
 	});
 
 	$userListBody.on('click', '.action-togglestate', function (event) {
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index aaf20b6eae..2506dba7fc 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -67,7 +67,7 @@
 			<td class="userActions">
 				<div class="toggleUserActions">
 					<a class="action"><span class="icon-more"></span></a>
-					<div class="popovermenu bubble menu">
+					<div class="popovermenu">
 						<ul class="userActionsMenu">
 							<li>
 								<a href="#" class="menuitem action-togglestate permanent" data-action="togglestate"></a>