diff --git a/src/components/structures/GroupGridView.js b/src/components/structures/GroupGridView.js
index b80eeced0c..ece4e5fa23 100644
--- a/src/components/structures/GroupGridView.js
+++ b/src/components/structures/GroupGridView.js
@@ -97,8 +97,8 @@ export default class RoomGridView extends React.Component {
         if (activeRoomId) {
             rightPanel = (
                 <div className="mx_GroupGridView_rightPanel">
-                    <div className="mx_GroupGridView_tabs"><RoomHeaderButtons /></div>
-                    <RightPanel roomId={activeRoomId} />
+                    <div className="mx_GroupGridView_tabs"><RoomHeaderButtons collapsedRhs={this.props.collapsedRhs} /></div>
+                    { !this.props.collapsedRhs ? <RightPanel roomId={activeRoomId} /> : undefined }
                 </div>
             );
         }
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 74274a5be2..67d7d41701 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -452,7 +452,7 @@ const LoggedInView = React.createClass({
                     />;
                 break;
             case PageTypes.GroupGridView:
-                page_element = <GroupGridView />;
+                page_element = <GroupGridView collapsedRhs={this.props.collapsedRhs} />;
                 break;
             case PageTypes.UserSettings:
                 page_element = <UserSettings