diff --git a/ui/StatusQ/sandbox/DemoApp.qml b/ui/StatusQ/sandbox/DemoApp.qml
index c2aef2b522..cbacb800f6 100644
--- a/ui/StatusQ/sandbox/DemoApp.qml
+++ b/ui/StatusQ/sandbox/DemoApp.qml
@@ -678,7 +678,7 @@ Rectangle {
         }
         ListElement {
             chatId: "1"
-            name: "#status-desktop"
+            name: "status-desktop"
             chatType: StatusChatListItem.Type.PublicChat
             muted: false
             hasUnreadMessages: true
diff --git a/ui/StatusQ/src/StatusQ/Components/StatusChatListItem.qml b/ui/StatusQ/src/StatusQ/Components/StatusChatListItem.qml
index dec32f8065..d5b61a1fb3 100644
--- a/ui/StatusQ/src/StatusQ/Components/StatusChatListItem.qml
+++ b/ui/StatusQ/src/StatusQ/Components/StatusChatListItem.qml
@@ -145,7 +145,10 @@ Rectangle {
             anchors.leftMargin: statusIcon.visible ? 1 : 8
             anchors.verticalCenter: parent.verticalCenter
 
-            text: statusChatListItem.name
+            text: statusChatListItem.type === StatusChatListItem.Type.PublicChat &&
+                !statusChatListItem.name.startsWith("#") ?
+                "#" + statusChatListItem.name :
+                statusChatListItem.name
             color: {
                 if (statusChatListItem.muted && !sensor.containsMouse && !statusChatListItem.highlighted) {
                     return Theme.palette.directColor5