diff --git a/src/components/views/rooms/SearchBar.js b/src/components/views/rooms/SearchBar.js
index c75a4f3c81..e66f123609 100644
--- a/src/components/views/rooms/SearchBar.js
+++ b/src/components/views/rooms/SearchBar.js
@@ -42,6 +42,9 @@ module.exports = React.createClass({
         if (e.keyCode === 13) { // on enter...
             this.onSearch();
         }
+        if (e.keyCode === 27) { // escape...
+            this.props.onCancelClick();
+        }
     },
 
     onSearch: function() {