diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index ef5ef89dc..836355e52 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,
@@ -942,10 +943,13 @@ class ChatListController extends State<ChatList>
 
         // #Pangea
         // await showFutureLoadingDialog(context: context, future: room.leave);
-        await showFutureLoadingDialog(
+        final resp = await showFutureLoadingDialog(
           context: context,
           future: room.isSpace ? room.leaveSpace : room.leave,
         );
+        if (mounted && !resp.isError) {
+          context.go("/rooms");
+        }
         // Pangea#
 
         return;