diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index d79617c046..d0868b690d 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -100,6 +100,10 @@ module.exports = React.createClass({
         }
 
         switch (ev.keyCode) {
+            case KeyCode.ESCAPE:
+                this._clearSearch();
+                dis.dispatch({action: 'focus_composer'});
+                break;
             case KeyCode.KEY_K:
                 if (ctrlCmdOnly) {
                     if (this.refs.search) {