diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index b5bacd753b..6e0301bfa1 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -1967,12 +1967,6 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 		if (!doctype) return;
 		frappe.provide("frappe.views.trees");
 
-		// refresh tree view
-		if (frappe.views.trees[doctype]) {
-			frappe.views.trees[doctype].tree.refresh();
-			return;
-		}
-
 		// refresh list view
 		const page_name = frappe.get_route_str();
 		const list_view = frappe.views.list_view[page_name];
diff --git a/frappe/public/js/frappe/ui/tree.js b/frappe/public/js/frappe/ui/tree.js
index 4b11b092eb..c32d92aa32 100644
--- a/frappe/public/js/frappe/ui/tree.js
+++ b/frappe/public/js/frappe/ui/tree.js
@@ -299,7 +299,6 @@ frappe.ui.Tree = class {
 				.appendTo($toolbar);
 			$link.on('click', () => {
 				obj.click(node);
-				this.refresh();
 			});
 		});
 
diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js
index 30da212f0a..cc0a233003 100644
--- a/frappe/public/js/frappe/views/treeview.js
+++ b/frappe/public/js/frappe/views/treeview.js
@@ -242,6 +242,7 @@ frappe.views.TreeView = class TreeView {
 					frappe.model.rename_doc(me.doctype, node.label, function(new_name) {
 						node.$tree_link.find('a').text(new_name);
 						node.label = new_name;
+						me.tree.refresh();
 					});
 				},
 				btnClass: "hidden-xs"
@@ -317,10 +318,7 @@ frappe.views.TreeView = class TreeView {
 				args: args,
 				callback: function(r) {
 					if(!r.exc) {
-						if(node.expanded) {
-							me.tree.toggle_node(node);
-						}
-						me.tree.load_children(node, true);
+						me.tree.load_children(node);
 					}
 				},
 				always: function() {