diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index fe2a3da03..6811526ed 100644
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
@@ -2123,7 +2123,7 @@
         "placeholders": {}
     },
     "writeAMessage": "Write a message…",
-    "writeAMessageFlag": "Write a message in {l1flag} or {l2flag}…",
+    "writeAMessageFlag": "Write a message in {l1flag} or {l2flag}",
     "@writeAMessageFlag": {
         "type": "text",
         "placeholders": {
diff --git a/assets/l10n/intl_es.arb b/assets/l10n/intl_es.arb
index d463699be..55728c83d 100644
--- a/assets/l10n/intl_es.arb
+++ b/assets/l10n/intl_es.arb
@@ -4590,7 +4590,7 @@
   "autoPlayDesc": "Cuando está activado, el audio de texto a voz de los mensajes se reproducirá automáticamente cuando se seleccione.",
   "presenceStyle": "Presencia:",
   "presencesToggle": "Mostrar mensajes de estado de otros usuarios",
-  "writeAMessageFlag": "Escribe un mensaje en {l1flag} o {l2flag}...",
+  "writeAMessageFlag": "Escribe un mensaje en {l1flag} o {l2flag}",
   "@writeAMessageFlag": {
     "type": "text",
     "placeholders": {
diff --git a/lib/pages/invitation_selection/invitation_selection_view.dart b/lib/pages/invitation_selection/invitation_selection_view.dart
index cafa5fec7..a83c27d64 100644
--- a/lib/pages/invitation_selection/invitation_selection_view.dart
+++ b/lib/pages/invitation_selection/invitation_selection_view.dart
@@ -4,6 +4,7 @@ import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:go_router/go_router.dart';
 import 'package:matrix/matrix.dart';
 
 class InvitationSelectionView extends StatelessWidget {
@@ -31,7 +32,14 @@ class InvitationSelectionView extends StatelessWidget {
     // Pangea#
     return Scaffold(
       appBar: AppBar(
-        leading: const Center(child: BackButton()),
+        // #Pangea
+        // leading: const Center(child: BackButton()),
+        leading: Center(
+          child: BackButton(
+            onPressed: () => context.go("/rooms/${controller.roomId}/details"),
+          ),
+        ),
+// Pangea#
         titleSpacing: 0,
         title: Text(L10n.of(context)!.inviteContact),
       ),
diff --git a/lib/pangea/utils/set_class_topic.dart b/lib/pangea/utils/set_class_topic.dart
index 67610c0ca..91625af42 100644
--- a/lib/pangea/utils/set_class_topic.dart
+++ b/lib/pangea/utils/set_class_topic.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:matrix/matrix.dart';
@@ -18,6 +17,10 @@ void setClassTopic(Room room, BuildContext context) {
       ),
       content: TextField(
         controller: textFieldController,
+        keyboardType: TextInputType.multiline,
+        minLines: 1,
+        maxLines: 10,
+        maxLength: 2000,
       ),
       actions: [
         TextButton(