diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index 007ac88db2..74dadbf2c4 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -125,7 +125,7 @@ module.exports = React.createClass({
         if (this.props.collapsed) {
             return null;
         }
-        const clearButton = !this.state.blurred ?
+        const clearButton = (!this.state.blurred || this.state.searchTerm) ?
             (<AccessibleButton key="button"
                     className="mx_SearchBox_closeButton"
                     onClick={ () => {this._clearSearch("button"); } }>