diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
index 816c3e97a..cfa56871e 100644
--- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml
+++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
@@ -52,7 +52,9 @@ Item {
             hoverComponent.showEdit = author.id === Controller.activeConnection.localUserId && (model.eventType === "emote" || model.eventType === "message");
 
             hoverComponent.editClicked = () => {
-                chatTextInput.edit(message, model.formattedBody, eventId);
+                if (hoverComponent.showEdit) {
+                    chatTextInput.edit(message, model.formattedBody, eventId);
+                } 
             };
             hoverComponent.replyClicked = () => {
                 replyToMessage(author, message, eventId);
diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml
index aa10e98d7..a989e59e2 100644
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -165,7 +165,7 @@ Kirigami.ScrollablePage {
             QQC2.Button {
                 QQC2.ToolTip.text: i18n("Edit")
                 QQC2.ToolTip.visible: hovered
-                visible: actions.hovered && showEdit
+                visible: hoverActions.showEdit
                 icon.name: "document-edit"
                 onClicked: hoverActions.editClicked()
             }