diff --git a/src/PageTypes.js b/src/PageTypes.js
index b2346c62c3..66d930c288 100644
--- a/src/PageTypes.js
+++ b/src/PageTypes.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,4 +24,5 @@ export default {
     RoomDirectory: "room_directory",
     UserView: "user_view",
     GroupView: "group_view",
+    MyGroups: "my_groups",
 };
diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index aef7fe9cce..a473df7c5b 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -211,6 +211,7 @@ export default React.createClass({
         const RoomDirectory = sdk.getComponent('structures.RoomDirectory');
         const HomePage = sdk.getComponent('structures.HomePage');
         const GroupView = sdk.getComponent('structures.GroupView');
+        const MyGroups = sdk.getComponent('structures.MyGroups');
         const MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
         const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
         const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
@@ -248,6 +249,11 @@ export default React.createClass({
                 if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>;
                 break;
 
+            case PageTypes.MyGroups:
+                page_element = <MyGroups />;
+                if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>;
+                break;
+
             case PageTypes.CreateRoom:
                 page_element = <CreateRoom
                     onRoomCreated={this.props.onRoomCreated}
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 025805d921..f0337fdd8e 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -486,6 +486,10 @@ module.exports = React.createClass({
                 this._setPage(PageTypes.RoomDirectory);
                 this.notifyNewScreen('directory');
                 break;
+            case 'view_my_groups':
+                this._setPage(PageTypes.MyGroups);
+                this.notifyNewScreen('groups');
+                break;
             case 'view_group':
                 {
                     const groupId = payload.group_id;
@@ -1151,6 +1155,10 @@ module.exports = React.createClass({
             dis.dispatch({
                 action: 'view_room_directory',
             });
+        } else if (screen == 'groups') {
+            dis.dispatch({
+                action: 'view_my_groups',
+            });
         } else if (screen == 'post_registration') {
             dis.dispatch({
                 action: 'start_post_registration',
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 27a377e8b7..6593c5aab8 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -925,5 +925,7 @@
   "Encryption key request": "Encryption key request",
   "Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
   "This Home server does not support groups": "This Home server does not support groups",
-  "Loading device info...": "Loading device info..."
+  "Loading device info...": "Loading device info...",
+  "Groups": "Groups",
+  "Create a new group": "Create a new group"
 }