diff --git a/resources/qml/ElidedLabel.qml b/resources/qml/ElidedLabel.qml
index 4c734cc5..321fa279 100644
--- a/resources/qml/ElidedLabel.qml
+++ b/resources/qml/ElidedLabel.qml
@@ -16,7 +16,7 @@ Label {
     property int fullTextWidth: Math.ceil(metrics.advanceWidth)
 
     color: Nheko.colors.text
-    text: (textFormat == Text.PlainText) ? metrics.elidedText : TimelineManager.escapeEmoji(TimelineManager.htmlEscape(metrics.elidedText))
+    text: (textFormat == Text.PlainText) ? metrics.elidedText : TimelineManager.escapeEmoji(metrics.elidedText)
     maximumLineCount: 1
     elide: Text.ElideRight
     textFormat: Text.PlainText
diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml
index 24b62fd2..a1abed00 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -387,7 +387,7 @@ Page {
                             Layout.alignment: Qt.AlignBaseline
                             color: roomItem.importantText
                             elideWidth: width
-                            fullText: roomName
+                            fullText: TimelineManager.htmlEscape(roomName)
                             textFormat: Text.RichText
                             Layout.fillWidth: true
                         }