diff --git a/core/html.py b/core/html.py
index a32b0a0..4efd700 100644
--- a/core/html.py
+++ b/core/html.py
@@ -196,7 +196,7 @@ class FediverseHtmlParser(HTMLParser):
                 self.mention_aliases[short_hash] = handle_hash
             elif self.mention_aliases.get(short_hash) != handle_hash:
                 short_handle = handle
-            return f'<a href="{html.escape(url)}" class="mention">@{html.escape(short_handle)}</a>'
+            return f'<a href="{html.escape(url)}" class="mention">@<span>{html.escape(short_handle)}</span></a>'
         else:
             return "@" + html.escape(handle)