diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 025e0f1a4f..7f089f6f9b 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -431,6 +431,10 @@ module.exports = React.createClass({
         }
 
         var self = this;
+        self.setState({
+            searchInProgress: true
+        });
+
         MatrixClientPeg.get().search({
             body: {
                 search_categories: {
@@ -484,6 +488,10 @@ module.exports = React.createClass({
                 title: "Search failed",
                 description: error.toString()
             });
+        }).finally(function() {
+            self.setState({
+                searchInProgress: false
+            });
         });
     },
 
@@ -951,7 +959,7 @@ module.exports = React.createClass({
                 aux = <Loader/>;
             }
             else if (this.state.searching) {
-                aux = <SearchBar ref="search_bar" onCancelClick={this.onCancelClick} onSearch={this.onSearch}/>;
+                aux = <SearchBar ref="search_bar" searchInProgress={this.state.searchInProgress } onCancelClick={this.onCancelClick} onSearch={this.onSearch}/>;
             }
 
             var conferenceCallNotification = null;