diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 55f588f212f..39463a67007 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -167,19 +167,25 @@ module.exports = React.createClass({
             return;
         }
 
-        if (this.state.phase === this.Phase.GroupMemberList) {
-            showGroupInviteDialog(this.props.groupId);
-        } else if (this.state.phase === this.Phase.GroupRoomList) {
-            showGroupAddRoomDialog(this.props.groupId).then(() => {
-                this.forceUpdate();
-            });
-        } else {
-            // call AddressPickerDialog
-            dis.dispatch({
-                action: 'view_invite',
-                roomId: this.props.roomId,
+        // call AddressPickerDialog
+        dis.dispatch({
+            action: 'view_invite',
+            roomId: this.props.roomId,
+        });
+    },
+
+    onInviteToGroupButtonClick: function() {
+        showGroupInviteDialog(this.props.groupId).then(() => {
+            this.setState({
+                phase: this.Phase.GroupMemberList,
             });
-        }
+        });
+    },
+
+    onAddRoomToGroupButtonClick: function() {
+        showGroupAddRoomDialog(this.props.groupId).then(() => {
+            this.forceUpdate();
+        });
     },
 
     onRoomStateMember: function(ev, state, member) {
@@ -233,6 +239,10 @@ module.exports = React.createClass({
             this.setState({
                 phase: this.Phase.GroupRoomList,
             });
+        } else if (payload.action === "view_group_member_list") {
+            this.setState({
+                phase: this.Phase.GroupMemberList,
+            });
         } else if (payload.action === "view_group_user") {
             this.setState({
                 phase: this.Phase.GroupMemberInfo,
@@ -376,14 +386,14 @@ module.exports = React.createClass({
 
         if (this.props.groupId && this.state.isUserPrivilegedInGroup) {
             inviteGroup = isPhaseGroup ? (
-                <AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteButtonClick}>
+                <AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteToGroupButtonClick}>
                     <div className="mx_RightPanel_icon" >
                         <TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
                     </div>
                     <div className="mx_RightPanel_message">{ _t('Invite to this community') }</div>
                 </AccessibleButton>
             ) : (
-                <AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteButtonClick}>
+                <AccessibleButton className="mx_RightPanel_invite" onClick={this.onAddRoomToGroupButtonClick}>
                     <div className="mx_RightPanel_icon" >
                         <TintableSvg src="img/icons-room-add.svg" width="35" height="35" />
                     </div>