diff --git a/src/components/mention_link/mention_link.scss b/src/components/mention_link/mention_link.scss
index be00093a74..9a285ad8f3 100644
--- a/src/components/mention_link/mention_link.scss
+++ b/src/components/mention_link/mention_link.scss
@@ -17,6 +17,8 @@
     width: 1.5em;
     height: 1.5em;
     vertical-align: middle;
+    user-select: none;
+    margin-right: 0.2em;
   }
 
   .full {
diff --git a/src/components/mention_link/mention_link.vue b/src/components/mention_link/mention_link.vue
index 8e78243a45..c0d7132299 100644
--- a/src/components/mention_link/mention_link.vue
+++ b/src/components/mention_link/mention_link.vue
@@ -23,13 +23,12 @@
         :href="url"
         @click.prevent="onClick"
       >
+        <!-- eslint-disable vue/no-v-html -->
         <UserAvatar
           v-if="shouldShowAvatar"
           class="mention-avatar"
           :user="user"
-        />
-        <!-- eslint-disable vue/no-v-html -->
-        <span
+        /><span
           class="shortName"
         ><FAIcon
           v-if="useAtIcon"