diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss
index 351e7e0a1b..8d8028c457 100644
--- a/res/css/structures/_LeftPanel.scss
+++ b/res/css/structures/_LeftPanel.scss
@@ -138,8 +138,13 @@ limitations under the License.
 .mx_LeftPanel_explore {
     flex: 0 0 40%;
     overflow: hidden;
+    transition: flex-basis 0.2s;
     box-sizing: border-box;
 
+    &.mx_LeftPanel_explore_hidden {
+        flex-basis: 0;
+    }
+
     .mx_AccessibleButton {
         font-size: 14px;
         margin: 9px;
diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index a15bf33645..fcae8bf4e6 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -82,6 +82,9 @@ const LeftPanel = React.createClass({
         if (this.state.searchFilter !== nextState.searchFilter) {
             return true;
         }
+        if (this.state.searchFocused !== nextState.searchFocused) {
+            return true;
+        }
 
         return false;
     },
@@ -210,6 +213,14 @@ const LeftPanel = React.createClass({
         this._roomList = ref;
     },
 
+    _onSearchFocus: function() {
+        this.setState({searchFocused: true});
+    },
+
+    _onSearchBlur: function() {
+        this.setState({searchFocused: false});
+    },
+
     render: function() {
         const RoomList = sdk.getComponent('rooms.RoomList');
         const RoomBreadcrumbs = sdk.getComponent('rooms.RoomBreadcrumbs');
@@ -256,6 +267,8 @@ const LeftPanel = React.createClass({
             placeholder={ _t('Filter room names') }
             onSearch={ this.onSearch }
             onCleared={ this.onSearchCleared }
+            onFocus={this._onSearchFocus}
+            onBlur={this._onSearchBlur}
             collapsed={this.props.collapsed} />);
 
         let breadcrumbs;
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js
index a66cfb17b6..e2421e68f4 100644
--- a/src/components/structures/SearchBox.js
+++ b/src/components/structures/SearchBox.js
@@ -94,6 +94,15 @@ module.exports = React.createClass({
 
     _onFocus: function(ev) {
         ev.target.select();
+        if (this.props.onFocus) {
+            this.props.onFocus(ev);
+        }
+    },
+
+    _onBlur: function(ev) {
+        if (this.props.onBlur) {
+            this.props.onBlur(ev);
+        }
     },
 
     _clearSearch: function(source) {
@@ -131,6 +140,7 @@ module.exports = React.createClass({
                     onChange={ this.onChange }
                     onKeyDown={ this._onKeyDown }
                     placeholder={ this.props.placeholder }
+                    onBlur={this._onBlur}
                 />
                 { clearButton }
             </div>