diff --git a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml
index 79fb84384a..41676aa8b9 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/ChatText.qml
@@ -79,7 +79,7 @@ Item {
             if(isEmoji) {
                 return Emoji.parse(msg, Emoji.size.middle);
             } else {
-                return Utils.getMessageWithStyle(Emoji.parse(msg), appSettings.useCompactMode, isCurrentUser)
+                return Utils.getMessageWithStyle(Emoji.parse(msg), appSettings.useCompactMode, isCurrentUser, hoveredLink)
             }
         }
     }
diff --git a/ui/imports/Themes/DarkTheme.qml b/ui/imports/Themes/DarkTheme.qml
index 2fa909f8b3..acc50cdbb9 100644
--- a/ui/imports/Themes/DarkTheme.qml
+++ b/ui/imports/Themes/DarkTheme.qml
@@ -68,6 +68,7 @@ Theme {
     property color emojiReactionActiveBackgroundHovered: "#cbd5f1"
     property color mentionColor: "#7BE5FF"
     property color mentionBgColor: "#1a0da4c9"
+    property color mentionBgHoverColor: "#4d0da4c9"
     property color mentionMessageColor: "#1a0da4c9"
     property color mentionMessageHoverColor: "#330da4c9"
     property color replyBackground: "#484848"
diff --git a/ui/imports/Themes/LightTheme.qml b/ui/imports/Themes/LightTheme.qml
index b6e8fb37db..db681abb61 100644
--- a/ui/imports/Themes/LightTheme.qml
+++ b/ui/imports/Themes/LightTheme.qml
@@ -68,6 +68,7 @@ Theme {
     property color emojiReactionActiveBackgroundHovered: "#cbd5f1"
     property color mentionColor: "#0DA4C9"
     property color mentionBgColor: "#1a07bce9"
+    property color mentionBgHoverColor: "#4d07bce9"
     property color mentionMessageColor: "#1a07bce9"
     property color mentionMessageHoverColor: "#3307bce9"
     property color replyBackground: "#d7dadd"
diff --git a/ui/imports/Themes/Theme.qml b/ui/imports/Themes/Theme.qml
index 69c804bce0..e14be61e89 100644
--- a/ui/imports/Themes/Theme.qml
+++ b/ui/imports/Themes/Theme.qml
@@ -52,6 +52,7 @@ QtObject {
     property color emojiReactionActiveBackgroundHovered
     property color mentionColor
     property color mentionBgColor
+    property color mentionBgHoverColor
     property color mentionMessageColor
     property color mentionMessageHoverColor
     property color mainMenuBackground
diff --git a/ui/imports/Utils.qml b/ui/imports/Utils.qml
index 1dce31fc77..e7c9aba373 100644
--- a/ui/imports/Utils.qml
+++ b/ui/imports/Utils.qml
@@ -49,7 +49,7 @@ QtObject {
         return Style.current.accountColors[colorIndex]
     }
 
-    function getMessageWithStyle(msg, useCompactMode, isCurrentUser) {
+    function getMessageWithStyle(msg, useCompactMode, isCurrentUser, hoveredLink = "") {
         return `<style type="text/css">` +
                     `p, img, a, del, code, blockquote { margin: 0; padding: 0; }` +
                     `code {` +
@@ -67,7 +67,9 @@ QtObject {
                         `color: ${Style.current.mentionColor};` +
                         `background-color: ${Style.current.mentionBgColor};` +
                         `text-decoration: none;` +
+                        `padding: 0px 2px;` +
                     `}` +
+                    (hoveredLink !== "" ? `a.mention[href="${hoveredLink}"] { background-color: ${Style.current.mentionBgHoverColor}; }` : ``) +
                     `del {` +
                         `text-decoration: line-through;` +
                     `}` +