diff --git a/public/script.js b/public/script.js
index 58f3acbc2..3cc67f8a8 100644
--- a/public/script.js
+++ b/public/script.js
@@ -4463,4 +4463,10 @@ $(document).ready(function () {
         icon.toggleClass('down up');
         $(this).closest('.inline-drawer').find('.inline-drawer-content').slideToggle();
     });
+
+    $(document).keyup(function(e) {
+        if (e.key === "Escape") {
+            closeMessageEditor();
+       }
+   });
 })