diff --git a/frappe/public/js/frappe/form/form_viewers.js b/frappe/public/js/frappe/form/form_viewers.js
index d9d5ba6e68..3d488e4729 100644
--- a/frappe/public/js/frappe/form/form_viewers.js
+++ b/frappe/public/js/frappe/form/form_viewers.js
@@ -6,11 +6,10 @@ frappe.ui.form.FormViewers = class FormViewers {
 	}
 
 	refresh() {
-		// REDESIGN-TODO: fix this
-		// let users = this.frm.get_docinfo()['viewers'];
-		// let currently_viewing = users.current.filter(user => user != frappe.session.user);
-		// let avatar_group = frappe.avatar_group(currently_viewing, 5, {'align': 'left', 'overlap': true});
-		this.parent.empty(); //.append(avatar_group);
+		let users = this.frm.get_docinfo()['viewers'];
+		let currently_viewing = users.current.filter(user => user != frappe.session.user);
+		let avatar_group = frappe.avatar_group(currently_viewing, 5, {'align': 'left', 'overlap': true});
+		this.parent.empty().append(avatar_group);
 	}
 };
 
diff --git a/frappe/public/js/frappe/form/toolbar.js b/frappe/public/js/frappe/form/toolbar.js
index 7e2502e58a..2f5b84fb1a 100644
--- a/frappe/public/js/frappe/form/toolbar.js
+++ b/frappe/public/js/frappe/form/toolbar.js
@@ -210,7 +210,10 @@ frappe.ui.form.Toolbar = class Toolbar {
 	}
 
 	make_viewers() {
-		if (this.frm.viewers) return;
+		if (this.frm.viewers) {
+			this.frm.viewers.parent.empty();
+			return;
+		}
 		this.frm.viewers = new frappe.ui.form.FormViewers({
 			frm: this.frm,
 			parent: $('<div class="form-viewers d-flex"></div>').prependTo(this.frm.page.page_actions)
diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js
index c9c98bd937..68bfc60a9e 100644
--- a/frappe/public/js/frappe/socketio_client.js
+++ b/frappe/public/js/frappe/socketio_client.js
@@ -159,8 +159,8 @@ frappe.socketio = {
 	},
 	doc_open: function(doctype, docname) {
 		// notify that the user has opened this doc, if not already notified
-		if(!frappe.socketio.last_doc
-			|| (frappe.socketio.last_doc[0]!=doctype && frappe.socketio.last_doc[1]!=docname)) {
+		if (!frappe.socketio.last_doc
+			|| (frappe.socketio.last_doc[0] != doctype || frappe.socketio.last_doc[1] != docname)) {
 			frappe.socketio.socket.emit('doc_open', doctype, docname);
 		}
 		frappe.socketio.last_doc = [doctype, docname];