diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 9df4630136..50b63b94b1 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -1299,7 +1299,7 @@ export default createReactClass({
                 );
             }
 
-            const rightPanel = !RightPanelStore.getSharedInstance().isOpenForGroup
+            const rightPanel = RightPanelStore.getSharedInstance().isOpenForGroup
                 ? <RightPanel groupId={this.props.groupId} />
                 : undefined;
 
diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js
index ebe1f5f915..dbcae4529a 100644
--- a/src/components/views/right_panel/HeaderButtons.js
+++ b/src/components/views/right_panel/HeaderButtons.js
@@ -74,7 +74,7 @@ export default class HeaderButtons extends React.Component {
         const rps = RightPanelStore.getSharedInstance();
         if (this.state.headerKind === HEADER_KIND_ROOM) {
             this.setState({phase: rps.visibleRoomPanelPhase});
-        } else if (this.state.head === HEADER_KIND_GROUP) {
+        } else if (this.state.headerKind === HEADER_KIND_GROUP) {
             this.setState({phase: rps.visibleGroupPanelPhase});
         }
     }