diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index e8484b2de3..87d327513f 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -22,7 +22,7 @@ frappe.views.ListSidebar = class ListSidebar {
 		this.sidebar = $('<div class="list-sidebar overlay-sidebar hidden-xs hidden-sm"></div>')
 			.html(sidebar_content)
 			.appendTo(this.page.sidebar.empty());
-		
+
 		this.setup_reports();
 		this.setup_list_filter();
 		this.setup_views();
@@ -253,10 +253,17 @@ frappe.views.ListSidebar = class ListSidebar {
 		let $elements = dropdown.find('li');
 		$dropdown_search.on('keyup',()=> {
 			let text_filter = $search_input.val().toLowerCase();
+			// Replace trailing and leading spaces
+			text_filter = text_filter.replace(/^\s+|\s+$/g, '')
 			let text;
 			for (var i = 0; i < $elements.length; i++) {
-				text = $elements.eq(i).find(text_class).text();
-				if (text.toLowerCase().indexOf(text_filter) > -1) {
+				let text_element = $elements.eq(i).find(text_class);
+
+				let text = text_element.text().toLowerCase();
+				// Search data-name since label for current user is 'Me'
+				let name = text_element.data('name').toLowerCase();
+
+				if (text.search(text_filter) || name.search(text_filter)) {
 					$elements.eq(i).css('display','');
 				} else {
 					$elements.eq(i).css('display','none');
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 288f95b511..a2e0d2b8e6 100644
--- a/frappe/public/js/frappe/list/list_sidebar_group_by.js
+++ b/frappe/public/js/frappe/list/list_sidebar_group_by.js
@@ -135,7 +135,7 @@ frappe.views.ListGroupBy = class ListGroupBy {
 
 			return `<li class="group-by-item" data-value="${value}">
 				<a class="badge-hover" href="#" onclick="return false;">
-					<span class="group-by-value">${label}</span>
+					<span class="group-by-value" data-name="${field.name}">${label}</span>
 					<span class="badge pull-right group-by-count">${field.count}</span>
 				</a>
 			</li>`;