diff --git a/templates/pages/chat.html b/templates/pages/chat.html
index eef2587..cb44143 100644
--- a/templates/pages/chat.html
+++ b/templates/pages/chat.html
@@ -453,6 +453,14 @@
 
         window.onload = function() {
             connectWebSocket();
+            
+            // Highlight mentions in pre-loaded messages
+            document.querySelectorAll('.chat-message-content').forEach(function(el) {
+                const text = el.innerHTML; // The Go template already escaped it for security
+                const newHTML = text.replace(/@(\w+)/g, '<span class="chat-message-mention">@$1</span>');
+                el.innerHTML = newHTML;
+            });
+
             document.getElementById('chat-messages').scrollTop = document.getElementById('chat-messages').scrollHeight;
         };
     </script>