diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 541d20db..ef11f886 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -192,10 +192,12 @@ Item {
         Shortcut {
             sequence: StandardKey.Cancel
             onActivated: {
-                if (chat.model.reply)
-                chat.model.reply = undefined;
+                if(room.input.uploads.length > 0)
+                    room.input.declineUploads();
+                else if(chat.model.reply)
+                    chat.model.reply = undefined;
                 else
-                chat.model.edit = undefined;
+                    chat.model.edit = undefined;
             }
         }