diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js
index 49956265f6..55b8c34ae6 100644
--- a/src/components/structures/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -216,13 +216,12 @@ const LeftPanel = React.createClass({
             onCleared={ this.onSearchCleared }
             collapsed={this.props.collapsed} />);
 
-
         return (
             <div className={containerClasses}>
                 { tagPanelContainer }
                 <aside className={"mx_LeftPanel dark-panel"} onKeyDown={ this._onKeyDown } onFocus={ this._onFocus } onBlur={ this._onBlur }>
                     <TopLeftMenuButton collapsed={ this.props.collapsed } />
-                    <RoomBreadcrumbs />
+                    <RoomBreadcrumbs collapsed={this.props.collapsed} />
                     { searchBox }
                     <CallPreview ConferenceHandler={VectorConferenceHandler} />
                     <RoomList
diff --git a/src/components/views/rooms/RoomBreadcrumbs.js b/src/components/views/rooms/RoomBreadcrumbs.js
index 304a92934a..9bba5434b4 100644
--- a/src/components/views/rooms/RoomBreadcrumbs.js
+++ b/src/components/views/rooms/RoomBreadcrumbs.js
@@ -72,6 +72,13 @@ export default class RoomBreadcrumbs extends React.Component {
     }
 
     render() {
+        // check for collapsed here and
+        // not at parent so we keep
+        // rooms in our state
+        // when collapsing and expanding
+        if (this.props.collapsed) {
+            return null;
+        }
         const avatars = this.state.rooms.map((room) => {
             return (
                 <AccessibleButton key={room.roomId} title={room.name} onClick={() => this._viewRoom(room)}>