diff --git a/lib/components/dialogs/new_group_dialog.dart b/lib/components/dialogs/new_group_dialog.dart
index 5299e69..65dfca0 100644
--- a/lib/components/dialogs/new_group_dialog.dart
+++ b/lib/components/dialogs/new_group_dialog.dart
@@ -1,23 +1,52 @@
 import 'package:fluffychat/views/chat.dart';
+import 'package:fluffychat/views/invitation_selection.dart';
 import 'package:flutter/material.dart';
+import 'package:pedantic/pedantic.dart';
 
 import '../matrix.dart';
 
-class NewGroupDialog extends StatelessWidget {
-  final TextEditingController controller = TextEditingController();
+class NewGroupDialog extends StatefulWidget {
+  @override
+  _NewGroupDialogState createState() => _NewGroupDialogState();
+}
+
+class _NewGroupDialogState extends State<NewGroupDialog> {
+  TextEditingController controller = TextEditingController();
+  bool publicGroup = false;
 
   void submitAction(BuildContext context) async {
     final MatrixState matrix = Matrix.of(context);
     Map<String, dynamic> params = {};
+    if (publicGroup) {
+      params["preset"] = "public_chat";
+      params["visibility"] = "public";
+      if (controller.text.isNotEmpty) {
+        params["room_alias_name"] = controller.text;
+      }
+    } else {
+      params["preset"] = "private_chat";
+    }
     if (controller.text.isNotEmpty) params["name"] = controller.text;
     final String roomID = await matrix.tryRequestWithLoadingDialog(
       matrix.client.createRoom(params: params),
     );
     Navigator.of(context).pop();
     if (roomID != null) {
+      unawaited(
+        Navigator.push(
+          context,
+          MaterialPageRoute(builder: (context) {
+            return Chat(roomID);
+          }),
+        ),
+      );
       await Navigator.push(
         context,
-        MaterialPageRoute(builder: (context) => Chat(roomID)),
+        MaterialPageRoute(
+          builder: (context) => InvitationSelection(
+            matrix.client.getRoomById(roomID),
+          ),
+        ),
       );
     }
   }
@@ -31,15 +60,19 @@ class NewGroupDialog extends StatelessWidget {
         children: <Widget>[
           TextField(
             controller: controller,
-            autofocus: true,
             autocorrect: false,
             textInputAction: TextInputAction.go,
             onSubmitted: (s) => submitAction(context),
             decoration: InputDecoration(
-                labelText: "Group name",
+                labelText: "(Optional) Group name",
                 icon: Icon(Icons.people),
                 hintText: "Enter a group name"),
           ),
+          SwitchListTile(
+            title: Text("Group is public"),
+            value: publicGroup,
+            onChanged: (bool b) => setState(() => publicGroup = b),
+          ),
         ],
       ),
       actions: <Widget>[
diff --git a/lib/utils/room_extension.dart b/lib/utils/room_extension.dart
index c415c78..1d6ec81 100644
--- a/lib/utils/room_extension.dart
+++ b/lib/utils/room_extension.dart
@@ -5,7 +5,8 @@ extension LocalizedRoomDisplayname on Room {
   String getLocalizedDisplayname(BuildContext context) {
     if ((this.name?.isEmpty ?? true) &&
         (this.canonicalAlias?.isEmpty ?? true) &&
-        !this.isDirectChat) {
+        !this.isDirectChat &&
+        this.mHeroes.isNotEmpty) {
       return "Group with ${this.displayname}";
     }
     return this.displayname;