diff --git a/static/js/hotkey.js b/static/js/hotkey.js
index 6c3178290b..b2ebda7bb4 100644
--- a/static/js/hotkey.js
+++ b/static/js/hotkey.js
@@ -170,12 +170,14 @@ exports.process_escape_key = function (e) {
     if (exports.processing_text()) {
         if ($(".message_edit_content").filter(":focus").length > 0) {
             row = $(".message_edit_content").filter(":focus").closest(".message_row");
+            row.find('.message_edit_content').blur();
             message_edit.end(row);
             return true;
         }
 
         if ($(".message_edit_topic").filter(":focus").length > 0) {
             row = $(".message_edit_topic").filter(":focus").closest(".message_row");
+            row.find('.message_edit_topic').blur();
             message_edit.end(row);
             return true;
         }