diff --git a/lib/components/dialogs/new_group_dialog.dart b/lib/components/dialogs/new_group_dialog.dart
index 65dfca04..36d4197d 100644
--- a/lib/components/dialogs/new_group_dialog.dart
+++ b/lib/components/dialogs/new_group_dialog.dart
@@ -61,6 +61,7 @@ class _NewGroupDialogState extends State<NewGroupDialog> {
           TextField(
             controller: controller,
             autocorrect: false,
+            autofocus: true,
             textInputAction: TextInputAction.go,
             onSubmitted: (s) => submitAction(context),
             decoration: InputDecoration(
diff --git a/lib/utils/event_extension.dart b/lib/utils/event_extension.dart
index 7793bb37..75f800f0 100644
--- a/lib/utils/event_extension.dart
+++ b/lib/utils/event_extension.dart
@@ -59,6 +59,12 @@ extension LocalizedBody on Event {
         if (newMembership != oldMembership) {
           if (oldMembership == "invite" && newMembership == "join") {
             text = "$targetName has accepted the invitation";
+          } else if (oldMembership == "invite" && newMembership == "leave") {
+            if (this.stateKey == this.senderId) {
+              text = "$targetName has rejected the invitation";
+            } else {
+              text = "$senderName has withdrawn the invitation for $targetName";
+            }
           } else if (oldMembership == "leave" && newMembership == "join") {
             text = "$targetName has joined the chat";
           } else if (oldMembership == "join" && newMembership == "ban") {