diff --git a/app/ui/client/lib/chatMessages.js b/app/ui/client/lib/chatMessages.js
index 27b7b8bcb65..801f79329d3 100644
--- a/app/ui/client/lib/chatMessages.js
+++ b/app/ui/client/lib/chatMessages.js
@@ -470,6 +470,12 @@ export class ChatMessages {
 
 			this.deleteMsg(message);
 
+			this.$input.focus();
+			done();
+		}, () => {
+			if (this.editing.id === message._id) {
+				this.clearEditing();
+			}
 			this.$input.focus();
 			done();
 		});