From a053caeda47c80c8cdfd0545f0f9038c1d7193fb Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Mon, 20 Jun 2016 10:11:42 +0800
Subject: [PATCH] FIX: Make sure we hide popup menu options on esc.

---
 app/assets/javascripts/discourse/views/composer.js.es6 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6
index aa6650571a..5d6924718b 100644
--- a/app/assets/javascripts/discourse/views/composer.js.es6
+++ b/app/assets/javascripts/discourse/views/composer.js.es6
@@ -71,6 +71,7 @@ const ComposerView = Ember.View.extend({
   keyDown(e) {
     if (e.which === 27) {
       this.get('controller').send('hitEsc');
+      this.get('controller').send('hideOptions');
       return false;
     } else if (e.which === 13 && (e.ctrlKey || e.metaKey)) {
       // CTRL+ENTER or CMD+ENTER