diff --git a/frappe/public/js/frappe/form/controls/comment.js b/frappe/public/js/frappe/form/controls/comment.js
index 6ce9defa3b..df345af379 100644
--- a/frappe/public/js/frappe/form/controls/comment.js
+++ b/frappe/public/js/frappe/form/controls/comment.js
@@ -1,5 +1,8 @@
+// import Quill from 'quill/dist/quill';
 import 'quill-mention';
 
+// Quill.register('modules/mention', QuillMention);
+
 frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({
 	make_wrapper() {
 		this.comment_wrapper = !this.no_wrapper ? $(`
@@ -68,9 +71,9 @@ frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({
 		const options = this._super();
 		return Object.assign(options, {
 			theme: 'bubble',
-			// modules: Object.assign(options.modules, {
-			// 	mention: this.get_mention_options()
-			// })
+			modules: Object.assign(options.modules, {
+				mention: this.get_mention_options()
+			})
 		});
 	},
 
diff --git a/package.json b/package.json
index 17b6e8300b..fc57af3ea8 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "moment-timezone": "^0.5.21",
     "quill": "2.0.0-dev.2",
     "quill-image-drop-module": "^1.0.3",
-    "quill-mention": "^2.0.2",
+    "quill-mention": "^2.0.4",
     "redis": "^2.8.0",
     "showdown": "^1.8.6",
     "socket.io": "^2.0.4",
diff --git a/yarn.lock b/yarn.lock
index 28b5052988..e8ec122113 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3036,10 +3036,10 @@ quill-image-drop-module@^1.0.3:
   dependencies:
     quill "^1.2.2"
 
-quill-mention@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/quill-mention/-/quill-mention-2.0.2.tgz#8e89e1d6b625d2df1b5a04af9338e35b18e91fce"
-  integrity sha512-G6VDFWVXO4ERuPamZEk+2VLvngZV18OxEzjPXsSayQij6K/s3RziiLEQ9MmRAr4umQVJ85W2VB7l4dX2qIW0MQ==
+quill-mention@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/quill-mention/-/quill-mention-2.0.4.tgz#4b636a4cc68945697d998d00bc035392dc8dc46a"
+  integrity sha512-nooIgpYPs1B76lqxCPR63Hdk0LEaMTxmXtC4feZz9q0K6gyNGDItrvdEsc+pltEEEro2pkOP8w1ibM1ldvDVvA==
   dependencies:
     quill "^1.3.4"