diff --git a/imports/NeoChat/Component/Timeline/MessageDelegate.qml b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
index fcdba1c4c..ad9cae648 100644
--- a/imports/NeoChat/Component/Timeline/MessageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
@@ -14,7 +14,7 @@ TimelineContainer {
     id: messageDelegate
 
     property bool isEmote: false
-    onOpenContextMenu: openMessageContext(model, parent.selectedText, Controller.plainText(label.textDocument))
+    onOpenContextMenu: openMessageContext(model, label.selectedText, Controller.plainText(label.textDocument))
 
     onReplyClicked: ListView.view.goToEvent(eventID)
     hoverComponent: hoverActions
diff --git a/imports/NeoChat/Component/Timeline/RichLabel.qml b/imports/NeoChat/Component/Timeline/RichLabel.qml
index 58cf0564f..eaa0b96bf 100644
--- a/imports/NeoChat/Component/Timeline/RichLabel.qml
+++ b/imports/NeoChat/Component/Timeline/RichLabel.qml
@@ -24,6 +24,8 @@ TextEdit {
     Layout.rightMargin: Kirigami.Units.largeSpacing
     Layout.leftMargin: Kirigami.Units.largeSpacing
 
+    persistentSelection: true
+
     text: "<style>
 table {
     width:100%;