diff --git a/lib/pages/chat_list/space_view.dart b/lib/pages/chat_list/space_view.dart
index 5ad99faa8..94341ed9e 100644
--- a/lib/pages/chat_list/space_view.dart
+++ b/lib/pages/chat_list/space_view.dart
@@ -11,10 +11,12 @@ import 'package:matrix/matrix.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat_list/chat_list_item.dart';
 import 'package:fluffychat/pages/chat_list/search_title.dart';
+import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
 import 'package:fluffychat/utils/stream_extension.dart';
 import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/matrix.dart';
+import 'package:fluffychat/widgets/public_room_bottom_sheet.dart';
 
 enum AddRoomType { chat, subspace }
 
@@ -95,38 +97,23 @@ class _SpaceViewState extends State<SpaceView> {
     final client = Matrix.of(context).client;
     final space = client.getRoomById(widget.spaceId);
 
-    final consent = await showOkCancelAlertDialog(
+    final joined = await showAdaptiveBottomSheet<bool>(
       context: context,
-      title: item.name ?? item.canonicalAlias ?? L10n.of(context)!.emptyChat,
-      message: item.topic,
-      okLabel: L10n.of(context)!.joinRoom,
-      cancelLabel: L10n.of(context)!.cancel,
-    );
-    if (consent != OkCancelResult.ok) return;
-    if (!mounted) return;
-
-    await showFutureLoadingDialog(
-      context: context,
-      future: () async {
-        await client.joinRoom(
-          item.roomId,
-          serverName: space?.spaceChildren
-              .firstWhereOrNull(
-                (child) => child.roomId == item.roomId,
-              )
-              ?.via,
-        );
-        if (client.getRoomById(item.roomId) == null) {
-          // Wait for room actually appears in sync
-          await client.waitForRoomInSync(item.roomId, join: true);
-        }
-      },
+      builder: (_) => PublicRoomBottomSheet(
+        outerContext: context,
+        chunk: item,
+        via: space?.spaceChildren
+            .firstWhereOrNull(
+              (child) => child.roomId == item.roomId,
+            )
+            ?.via,
+      ),
     );
-    if (!mounted) return;
-
-    setState(() {
-      _discoveredChildren.remove(item);
-    });
+    if (mounted && joined == true) {
+      setState(() {
+        _discoveredChildren.remove(item);
+      });
+    }
   }
 
   void _onSpaceAction(SpaceActions action) async {
diff --git a/lib/widgets/public_room_bottom_sheet.dart b/lib/widgets/public_room_bottom_sheet.dart
index 3ac568d8c..3105cc576 100644
--- a/lib/widgets/public_room_bottom_sheet.dart
+++ b/lib/widgets/public_room_bottom_sheet.dart
@@ -15,13 +15,13 @@ class PublicRoomBottomSheet extends StatelessWidget {
   final String? roomAlias;
   final BuildContext outerContext;
   final PublicRoomsChunk? chunk;
-  final VoidCallback? onRoomJoined;
+  final List<String>? via;
 
   PublicRoomBottomSheet({
     this.roomAlias,
     required this.outerContext,
     this.chunk,
-    this.onRoomJoined,
+    this.via,
     super.key,
   }) {
     assert(roomAlias != null || chunk != null);
@@ -38,8 +38,11 @@ class PublicRoomBottomSheet extends StatelessWidget {
           return chunk.roomId;
         }
         final roomId = chunk != null && knock
-            ? await client.knockRoom(chunk.roomId)
-            : await client.joinRoom(roomAlias ?? chunk!.roomId);
+            ? await client.knockRoom(chunk.roomId, serverName: via)
+            : await client.joinRoom(
+                roomAlias ?? chunk!.roomId,
+                serverName: via,
+              );
 
         if (!knock && client.getRoomById(roomId) == null) {
           await client.waitForRoomInSync(roomId);
@@ -51,7 +54,7 @@ class PublicRoomBottomSheet extends StatelessWidget {
       return;
     }
     if (result.error == null) {
-      Navigator.of(context).pop();
+      Navigator.of(context).pop<bool>(true);
       // don't open the room if the joined room is a space
       if (chunk?.roomType != 'm.space' &&
           !client.getRoomById(result.result!)!.isSpace) {