diff --git a/lib/pages/chat/chat_input_row.dart b/lib/pages/chat/chat_input_row.dart
index 82f80d394..46c9ecb22 100644
--- a/lib/pages/chat/chat_input_row.dart
+++ b/lib/pages/chat/chat_input_row.dart
@@ -262,6 +262,9 @@ class ChatInputRow extends StatelessWidget {
                       filled: false,
                     ),
                     onChanged: controller.onInputBarChanged,
+                    // #Pangea
+                    hintText: "",
+                    // Pangea#
                   ),
                 ),
               ),
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 7fe557174..aa21c7167 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -43,6 +43,7 @@ import '../../widgets/matrix.dart';
 import 'package:fluffychat/utils/tor_stub.dart'
     if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart';
 
+
 enum PopupMenuAction {
   settings,
   invite,
@@ -485,6 +486,17 @@ class ChatListController extends State<ChatList>
 
   @override
   void initState() {
+    // #Pangea
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final params = GoRouterState.of(context).uri.queryParameters;
+      if (!params.containsKey("filter") || params['filter'] != 'groups') return;
+      setActiveFilter(
+        AppConfig.separateChatTypes
+            ? ActiveFilter.groups
+            : ActiveFilter.allChats,
+      );
+    });
+    // Pangea#
     _initReceiveSharingIntent();
 
     scrollController.addListener(_onScroll);
diff --git a/lib/pages/new_group/new_group.dart b/lib/pages/new_group/new_group.dart
index 29a63c010..5b4a69892 100644
--- a/lib/pages/new_group/new_group.dart
+++ b/lib/pages/new_group/new_group.dart
@@ -8,7 +8,6 @@ import 'package:matrix/matrix.dart' as sdk;
 import 'package:matrix/matrix.dart';
 
 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/pages/chat_list/chat_list.dart';
 import 'package:fluffychat/pages/new_group/new_group_view.dart';
 import 'package:fluffychat/pangea/activity_planner/activity_plan_model.dart';
 import 'package:fluffychat/pangea/bot/utils/bot_name.dart';
@@ -166,11 +165,7 @@ class NewGroupController extends State<NewGroup> {
     // if a timeout happened, don't redirect to the chat
     if (error != null) return;
     // Pangea#
-    MatrixState.pangeaController.classController
-        .setActiveFilterInChatListController(
-      AppConfig.separateChatTypes ? ActiveFilter.groups : ActiveFilter.allChats,
-    );
-    context.go('/rooms/$roomId/invite');
+    context.go('/rooms/$roomId/invite?filter=groups');
   }
 
   Future<void> _createSpace() async {
diff --git a/lib/pangea/activity_planner/activity_plan_card.dart b/lib/pangea/activity_planner/activity_plan_card.dart
index ad584bafd..3152a8b8f 100644
--- a/lib/pangea/activity_planner/activity_plan_card.dart
+++ b/lib/pangea/activity_planner/activity_plan_card.dart
@@ -204,7 +204,7 @@ class ActivityPlanCardState extends State<ActivityPlanCard> {
           filename: _filename,
         );
 
-        context.go("/rooms/$roomId/invite");
+        context.go("/rooms/$roomId/invite?filter=groups");
       },
     );
   }
diff --git a/lib/pangea/activity_suggestions/activity_suggestion_dialog.dart b/lib/pangea/activity_suggestions/activity_suggestion_dialog.dart
index a34620a65..0bcdaef91 100644
--- a/lib/pangea/activity_suggestions/activity_suggestion_dialog.dart
+++ b/lib/pangea/activity_suggestions/activity_suggestion_dialog.dart
@@ -210,7 +210,8 @@ class ActivitySuggestionDialogState extends State<ActivitySuggestionDialog> {
       avatar: _avatar,
       filename: _filename,
     );
-    context.go("/rooms/$roomId/invite");
+
+    context.go("/rooms/$roomId/invite?filter=groups");
   }
 
   Future<void> _saveEdits() async {