diff --git a/frappe/public/js/frappe/socket.js b/frappe/public/js/frappe/socket.js
index 2a64d92fa1..1158756826 100644
--- a/frappe/public/js/frappe/socket.js
+++ b/frappe/public/js/frappe/socket.js
@@ -13,7 +13,8 @@ frappe.socket = {
 
 		frappe.socket.setup_listeners();
 		frappe.socket.setup_reconnect();
-		$(document).on('form-load', function(e, frm) {
+
+		$(document).on('form-load form-rename', function(e, frm) {
 			if (frm.is_new()) {
 				return;
 			}
diff --git a/frappe/public/js/legacy/form.js b/frappe/public/js/legacy/form.js
index 7f3d14fcb8..8511ffe048 100644
--- a/frappe/public/js/legacy/form.js
+++ b/frappe/public/js/legacy/form.js
@@ -402,6 +402,11 @@ _f.Frm.prototype.refresh = function(docname) {
 			})
 		} else {
 			this.render_form(is_a_different_doc);
+			if (this.doc.localname) {
+				// trigger form-rename and remove .localname
+				delete this.doc.localname;
+				$(document).trigger("form-rename", [this]);
+			}
 		}
 
 		// if print format is shown, refresh the format