Merge pull request #3432 from matrix-org/bwindels/fix-filter-x

Fix: only hide clear filter button when blurred & no more search term

src/components/structures/SearchBox.js

@@ -126,7 +126,7 @@ module.exports = createReactClass({
         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"); } }>