diff --git a/frappe/public/js/frappe/list/list_sidebar_group_by.js b/frappe/public/js/frappe/list/list_sidebar_group_by.js
index 8f35781a04..65819c2787 100644
--- a/frappe/public/js/frappe/list/list_sidebar_group_by.js
+++ b/frappe/public/js/frappe/list/list_sidebar_group_by.js
@@ -125,9 +125,10 @@ frappe.views.ListGroupBy = class ListGroupBy {
 		return frappe.call('frappe.desk.listview.get_group_by_count', args).then((r) => {
 			let field_counts = r.message || [];
 			field_counts = field_counts.filter(f => f.count !== 0);
-			if (field === 'assigned_to') {
-				field_counts = field_counts.filter(f => !['Guest', 'Administrator'].includes(f.name));
-			}
+			let current_user = field_counts.find(f => f.name === frappe.session.user);
+			field_counts = field_counts.filter(f => !['Guest', 'Administrator', frappe.session.user].includes(f.name));
+			// Set frappe.session.user on top of the list
+			if(current_user) field_counts.unshift(current_user);
 			return field_counts;
 		});
 	}
@@ -153,9 +154,6 @@ frappe.views.ListGroupBy = class ListGroupBy {
 			</div>
 		`;
 
-		// Sort and set frappe.session.user on top of the list
-		fields.sort((item) => item.name ===  frappe.session.user ? -1 : 1);
-
 		let dropdown_html = standard_html + fields.map(get_dropdown_html).join('');
 		dropdown.html(dropdown_html);
 	}