diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 11416b29fb..b2b1ceae00 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -47,10 +47,10 @@ export default class RightPanel extends React.Component {
     constructor(props, context) {
         super(props, context);
         this.state = {
+            ...RightPanelStore.getSharedInstance().roomPanelPhaseParams,
             phase: this._getPhaseFromProps(),
             isUserPrivilegedInGroup: null,
             member: this._getUserForPanel(),
-            verificationRequest: RightPanelStore.getSharedInstance().roomPanelPhaseParams.verificationRequest,
         };
         this.onAction = this.onAction.bind(this);
         this.onRoomStateMember = this.onRoomStateMember.bind(this);
@@ -102,10 +102,6 @@ export default class RightPanel extends React.Component {
             }
             return RightPanelPhases.RoomMemberInfo;
         } else {
-            if (!RIGHT_PANEL_PHASES_NO_ARGS.includes(rps.roomPanelPhase)) {
-                dis.dispatch({action: Action.SetRightPanelPhase, phase: RightPanelPhases.RoomMemberList});
-                return RightPanelPhases.RoomMemberList;
-            }
             return rps.roomPanelPhase;
         }
     }
diff --git a/src/stores/RightPanelStore.ts b/src/stores/RightPanelStore.ts
index 34445d007b..c539fcdb40 100644
--- a/src/stores/RightPanelStore.ts
+++ b/src/stores/RightPanelStore.ts
@@ -33,6 +33,8 @@ interface RightPanelStoreState {
     lastRoomPhase: RightPanelPhases;
     lastGroupPhase: RightPanelPhases;
 
+    previousPhase?: RightPanelPhases;
+
     // Extra information about the last phase
     lastRoomPhaseParams: {[key: string]: any};
 }
@@ -89,6 +91,10 @@ export default class RightPanelStore extends Store<ActionPayload> {
         return this.state.lastGroupPhase;
     }
 
+    get previousPhase(): RightPanelPhases | null {
+        return RIGHT_PANEL_PHASES_NO_ARGS.includes(this.state.previousPhase) ? this.state.previousPhase : null;
+    }
+
     get visibleRoomPanelPhase(): RightPanelPhases {
         return this.isOpenForRoom ? this.roomPanelPhase : null;
     }
@@ -176,23 +182,27 @@ export default class RightPanelStore extends Store<ActionPayload> {
                     if (targetPhase === this.state.lastGroupPhase) {
                         this.setState({
                             showGroupPanel: !this.state.showGroupPanel,
+                            previousPhase: null,
                         });
                     } else {
                         this.setState({
                             lastGroupPhase: targetPhase,
                             showGroupPanel: true,
+                            previousPhase: this.state.lastGroupPhase,
                         });
                     }
                 } else {
                     if (targetPhase === this.state.lastRoomPhase && !refireParams) {
                         this.setState({
                             showRoomPanel: !this.state.showRoomPanel,
+                            previousPhase: null,
                         });
                     } else {
                         this.setState({
                             lastRoomPhase: targetPhase,
                             showRoomPanel: true,
                             lastRoomPhaseParams: refireParams || {},
+                            previousPhase: this.state.lastRoomPhase,
                         });
                     }
                 }