diff --git a/app/components/at_mention/at_mention.js b/app/components/at_mention/at_mention.js
index a32cdcf6d..99be4eee5 100644
--- a/app/components/at_mention/at_mention.js
+++ b/app/components/at_mention/at_mention.js
@@ -169,7 +169,7 @@ export default class AtMention extends React.PureComponent {
         } else {
             const group = this.getGroupFromMentionName();
             if (group.allow_reference) {
-                highlighted = mentionKeys.some((item) => item.key === group.name);
+                highlighted = mentionKeys.some((item) => item.key === `@${group.name}`);
                 isMention = true;
                 mention = group.name;
                 suffix = this.props.mentionName.substring(group.name.length);