diff --git a/lib/pages/chat_list/start_chat_fab.dart b/lib/pages/chat_list/start_chat_fab.dart
index 117833ff0..f25374f4e 100644
--- a/lib/pages/chat_list/start_chat_fab.dart
+++ b/lib/pages/chat_list/start_chat_fab.dart
@@ -30,7 +30,9 @@ class StartChatFloatingActionButton extends StatelessWidget {
   void _onPressed(BuildContext context) async {
     //#Pangea
     if (controller.activeSpaceId != null) {
-      context.go('/rooms/newgroup?spaceId=${controller.activeSpaceId ?? ''}');
+      context.go(
+        '/rooms/newgroup${controller.activeSpaceId != null ? '?spaceId=${controller.activeSpaceId}' : ''}',
+      );
       return;
     }
     //Pangea#
@@ -44,7 +46,9 @@ class StartChatFloatingActionButton extends StatelessWidget {
       case ActiveFilter.groups:
         // #Pangea
         // context.go('/rooms/newgroup');
-        context.go('/rooms/newgroup?spaceId=${controller.activeSpaceId ?? ''}');
+        context.go(
+          '/rooms/newgroup${controller.activeSpaceId != null ? '?spaceId=${controller.activeSpaceId}' : ''}',
+        );
         // Pangea#
         break;
       case ActiveFilter.spaces:
diff --git a/lib/pangea/extensions/pangea_room_extension.dart b/lib/pangea/extensions/pangea_room_extension.dart
index bf152012a..febd17fa8 100644
--- a/lib/pangea/extensions/pangea_room_extension.dart
+++ b/lib/pangea/extensions/pangea_room_extension.dart
@@ -815,6 +815,9 @@ extension PangeaRoom on Room {
       );
       return false;
     }
+    if (room != null && !room.isRoomAdmin) {
+      return false;
+    }
     if (!pangeaCanSendEvent(EventTypes.spaceChild) && !isRoomAdmin) {
       return false;
     }
diff --git a/lib/pangea/widgets/class/add_space_toggles.dart b/lib/pangea/widgets/class/add_space_toggles.dart
index cd875cd95..eb06cd26a 100644
--- a/lib/pangea/widgets/class/add_space_toggles.dart
+++ b/lib/pangea/widgets/class/add_space_toggles.dart
@@ -235,8 +235,13 @@ class AddToSpaceState extends State<AddToSpaceToggles> {
                     ),
                     activeColor: AppConfig.activeToggleColor,
                     value: isSuggestedInSpace(possibleParent),
-                    onChanged: (bool suggest) =>
-                        setSuggested(suggest, possibleParent),
+                    onChanged: (bool suggest) => canAdd
+                        ? setSuggested(suggest, possibleParent)
+                        : ScaffoldMessenger.of(context).showSnackBar(
+                            SnackBar(
+                              content: Text(L10n.of(context)!.noPermission),
+                            ),
+                          ),
                   )
                 : Container(),
           ),