diff --git a/frappe/public/js/frappe/ui/tree.js b/frappe/public/js/frappe/ui/tree.js
index d7fcb98f90..fa0fb4674c 100644
--- a/frappe/public/js/frappe/ui/tree.js
+++ b/frappe/public/js/frappe/ui/tree.js
@@ -245,7 +245,10 @@ frappe.ui.Tree = class {
 				.html(label)
 				.addClass('tree-toolbar-button ' + (obj.btnClass || ''))
 				.appendTo($toolbar);
-			$link.on('click', () => { obj.click(node); return false; });
+			$link.on('click', () => {
+				obj.click(node);
+				this.refresh();
+			});
 		});
 
 		return $toolbar;
diff --git a/frappe/public/js/frappe/views/treeview.js b/frappe/public/js/frappe/views/treeview.js
index 7853450096..6eb2c190b7 100644
--- a/frappe/public/js/frappe/views/treeview.js
+++ b/frappe/public/js/frappe/views/treeview.js
@@ -226,7 +226,7 @@ frappe.views.TreeView = Class.extend({
 				},
 				click: function(node) {
 					frappe.model.rename_doc(me.doctype, node.label, function(new_name) {
-						node.tree_link.find('a').text(new_name);
+						node.$tree_link.find('a').text(new_name);
 						node.label = new_name;
 					});
 				},