diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js
index 177d168fb5..7c760b80a3 100644
--- a/frappe/public/js/frappe/form/footer/timeline.js
+++ b/frappe/public/js/frappe/form/footer/timeline.js
@@ -310,9 +310,9 @@ frappe.ui.form.Timeline = Class.extend({
 			// bold @mentions
 			if(c.comment_type==="Comment" &&
 				// avoid adding <b> tag a 2nd time
-				!c.content_html.match(/(^|\W)<b>(@\w+)<\/b>/)
+				!c.content_html.match(/(^|\W)<b>(@[^\s]+)<\/b>/)
 			) {
-				c.content_html = c.content_html.replace(/(^|\W)(@\w+)/g, "$1<b>$2</b>");
+				c.content_html = c.content_html.replace(/(^|\W)(@[^\s]+)/g, "$1<b>$2</b>");
 			}
 
 			if (this.is_communication_or_comment(c)) {