diff --git a/src/components/views/dialogs/CreateGroupDialog.js b/src/components/views/dialogs/CreateGroupDialog.js
index 10285ccee0..d8a8b96961 100644
--- a/src/components/views/dialogs/CreateGroupDialog.js
+++ b/src/components/views/dialogs/CreateGroupDialog.js
@@ -83,11 +83,18 @@ export default createReactClass({
             localpart: this.state.groupId,
             profile: profile,
         }).then((result) => {
-            dis.dispatch({
-                action: 'view_group',
-                group_id: result.group_id,
-                group_is_new: true,
-            });
+            if (result.room_id) {
+                dis.dispatch({
+                    action: 'view_room',
+                    room_id: result.room_id,
+                });
+            } else {
+                dis.dispatch({
+                    action: 'view_group',
+                    group_id: result.group_id,
+                    group_is_new: true,
+                });
+            }
             this.props.onFinished(true);
         }).catch((e) => {
             this.setState({createError: e});