diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js
index 6e873a9b59..db0b556260 100644
--- a/src/components/structures/GroupView.js
+++ b/src/components/structures/GroupView.js
@@ -39,13 +39,13 @@ module.exports = React.createClass({
         this._loadGroupFromServer(this.props.groupId);
     },
 
-    componentWillReceiveProps: function(new_props) {
-        if (this.props.groupId != new_props.groupId) {
+    componentWillReceiveProps: function(newProps) {
+        if (this.props.groupId != newProps.groupId) {
             this.setState({
                 summary: null,
                 error: null,
-            })
-            this._loadGroupFromServer(new_props.groupId);
+            });
+            this._loadGroupFromServer(newProps.groupId);
         }
     },
 
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index f4da0e6a44..025805d921 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -487,10 +487,12 @@ module.exports = React.createClass({
                 this.notifyNewScreen('directory');
                 break;
             case 'view_group':
-                const groupId = payload.group_id;
-                this.setState({currentGroupId: groupId});
-                this._setPage(PageTypes.GroupView);
-                this.notifyNewScreen('group/' + groupId);
+                {
+                    const groupId = payload.group_id;
+                    this.setState({currentGroupId: groupId});
+                    this._setPage(PageTypes.GroupView);
+                    this.notifyNewScreen('group/' + groupId);
+                }
                 break;
             case 'view_home_page':
                 this._setPage(PageTypes.HomePage);