diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6
index aa6650571ad..5d6924718b1 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