diff --git a/imports/NeoChat/Component/ChatBox/ReplyPane.qml b/imports/NeoChat/Component/ChatBox/ReplyPane.qml
index 2e72d622f..a637ffc24 100644
--- a/imports/NeoChat/Component/ChatBox/ReplyPane.qml
+++ b/imports/NeoChat/Component/ChatBox/ReplyPane.qml
@@ -106,7 +106,7 @@ Loader {
                 text: i18n("Cancel")
                 display: AbstractButton.IconOnly
                 onClicked: {
-                    ChatBoxHelper.clearEditReply();
+                    ChatBoxHelper.clear();
                     root.replyCancelled();
                 }
                 ToolTip.text: text
diff --git a/src/chatboxhelper.cpp b/src/chatboxhelper.cpp
index e1aec653b..2902f2dd6 100644
--- a/src/chatboxhelper.cpp
+++ b/src/chatboxhelper.cpp
@@ -131,8 +131,8 @@ void ChatBoxHelper::clear()
     setEditContent(QString());
     setReplyEventId(QString());
     setReplyEventContent(QString());
-    setAttachmentPath(QString());
     setReplyUser(QVariant());
+    setAttachmentPath(QString());
 }
 
 void ChatBoxHelper::edit(const QString &message, const QString &formattedBody, const QString &eventId)
@@ -149,6 +149,7 @@ void ChatBoxHelper::clearEditReply()
     setReplyEventId(QString());
     setReplyEventContent(QString());
     setReplyUser(QVariant());
+    setAttachmentPath(QString());
     Q_EMIT shouldClearText();
 }