diff --git a/src/app/chat/views/message_format.nim b/src/app/chat/views/message_format.nim
index 0f0437633a..1b6b767ef1 100644
--- a/src/app/chat/views/message_format.nim
+++ b/src/app/chat/views/message_format.nim
@@ -20,6 +20,7 @@ proc renderInline(self: ChatMessageList, elem: TextItem): string =
   of "strong": result = fmt("<span style=\"font-weight: bold;\">{elem.literal}</span> ")
   of "link": result = elem.destination
   of "mention": result = fmt("<span style=\"color: #000000;\">{self.mention(elem.literal)}</span> ")
+  of "status-tag": result = fmt("<a href=\"#{elem.literal}\" class=\"status-tag\">{elem.literal}</a> ")
 
 # See render-block in status-react/src/status_im/ui/screens/chat/message/message.cljs
 proc renderBlock(self: ChatMessageList, message: Message): string =
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
index 85b5587970..faeb6e3877 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/Message.qml
@@ -280,7 +280,14 @@ Item {
             selectByMouse: true
             color: !isCurrentUser ? Theme.black : Theme.white
             visible: contentType == Constants.messageType || isEmoji
-            onLinkActivated: Qt.openUrlExternally(link)
+            onLinkActivated: {
+                if(link.startsWith("#")){
+                    chatsModel.joinChat(link.substring(1), Constants.chatTypePublic);
+                    return;
+                }
+
+                Qt.openUrlExternally(link)
+            }
             MouseArea {
                 anchors.fill: parent
                 acceptedButtons: Qt.NoButton // we don't want to eat clicks on the Text