diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 5db6ae18bf..9caf72d3bd 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -267,18 +267,14 @@ def get_sidebar_stats(stats, doctype, filters=[]):
 	data = frappe._dict(frappe.local.form_dict)
 	filters = json.loads(data["filters"])
 
-	if not frappe.cache().hget("Tags", doctype):
-		tags = set([tag.tag for tag in frappe.get_list("Tag Link", filters={"document_type": doctype}, fields=["tag"])])
-		frappe.cache().hset("Tags", doctype, tags)
-
-	for tag in list(frappe.cache().hget("Tags", doctype)):
+	for tag in frappe.get_all("Tag Link", filters={"document_type": doctype}, fields=["tag"]):
 		tag_filters = []
 		tag_filters.extend(filters)
-		tag_filters.extend([['Tag Link', 'tag', '=', tag]])
+		tag_filters.extend([['Tag Link', 'tag', '=', tag.tag]])
 
 		count = frappe.get_all(doctype, filters=tag_filters, fields=["count(*)"])
 		if count[0].get("count(*)") > 0:
-			_user_tags.append([tag, count[0].get("count(*)")])
+			_user_tags.append([tag.tag, count[0].get("count(*)")])
 
 	return {"stats": {"_user_tags": _user_tags}}
 
diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js
index c5084f7d6d..5e1b717720 100644
--- a/frappe/public/js/frappe/list/base_list.js
+++ b/frappe/public/js/frappe/list/base_list.js
@@ -207,7 +207,7 @@ frappe.views.BaseList = class BaseList {
 
 	show_or_hide_sidebar() {
 		let show_sidebar = JSON.parse(localStorage.show_sidebar || 'true');
-		$(document.body).toggleClass('no-sidebar', !show_sidebar);
+		$(document.body).toggleClass('no-list-sidebar', !show_sidebar);
 	}
 
 	setup_main_section() {
diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less
index 8336f13f11..c22184406c 100644
--- a/frappe/public/less/list.less
+++ b/frappe/public/less/list.less
@@ -50,6 +50,19 @@
 	}
 }
 
+body.no-list-sidebar {
+	[data-page-route^="List/"] {
+		@media (min-width: @screen-md) {
+			.layout-side-section {
+				display: none;
+			}
+
+			.layout-main-section-wrapper {
+				width: 100% !important;
+			}
+		}
+	}
+}
 
 .filter-list {
 	position: relative;