diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb
index 121771cde..bb9d15f0c 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 ec1314fa2..d8f54304a 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.dart b/lib/pages/invitation_selection/invitation_selection.dart
index 5f2bd5027..2be9e1879 100644
--- a/lib/pages/invitation_selection/invitation_selection.dart
+++ b/lib/pages/invitation_selection/invitation_selection.dart
@@ -176,22 +176,6 @@ class InvitationSelectionController extends State<InvitationSelection> {
   Future<void> inviteTeacherAction(Room room, String id) async {
     await room.invite(id);
     await room.setPower(id, ClassDefaultValues.powerLevelOfAdmin);
-    if (room.isSpace) {
-      for (final spaceChild in room.spaceChildren) {
-        if (spaceChild.roomId == null) continue;
-        final spaceChildRoom =
-            Matrix.of(context).client.getRoomById(spaceChild.roomId!);
-        if (spaceChildRoom != null &&
-            !(await spaceChildRoom.isBotDM) &&
-            !spaceChildRoom.isDirectChat) {
-          await spaceChildRoom.invite(id);
-          await spaceChildRoom.setPower(
-            id,
-            ClassDefaultValues.powerLevelOfAdmin,
-          );
-        }
-      }
-    }
   }
   // Pangea#
 
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/chat_list_handle_space_tap.dart b/lib/pangea/utils/chat_list_handle_space_tap.dart
index 01d99bda2..7205748df 100644
--- a/lib/pangea/utils/chat_list_handle_space_tap.dart
+++ b/lib/pangea/utils/chat_list_handle_space_tap.dart
@@ -75,11 +75,6 @@ void chatListHandleSpaceTap(
               duration: const Duration(seconds: 3),
             ),
           );
-          if (space.isExchange) {
-            context.go(
-              '/rooms/join_exchange/${controller.activeSpaceId}',
-            );
-          }
         },
       );
     } else {