diff --git a/lib/pages/homeserver_picker/homeserver_picker_view.dart b/lib/pages/homeserver_picker/homeserver_picker_view.dart
index fa958320..3cd9d713 100644
--- a/lib/pages/homeserver_picker/homeserver_picker_view.dart
+++ b/lib/pages/homeserver_picker/homeserver_picker_view.dart
@@ -4,6 +4,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/widgets/layouts/login_scaffold.dart';
+import 'package:fluffychat/widgets/matrix.dart';
 import '../../config/themes.dart';
 import '../../widgets/mxc_image.dart';
 import 'homeserver_app_bar.dart';
@@ -19,6 +20,7 @@ class HomeserverPickerView extends StatelessWidget {
     final identityProviders = controller.identityProviders;
     final errorText = controller.error;
     return LoginScaffold(
+      enforceMobileMode: Matrix.of(context).client.isLogged(),
       appBar: AppBar(
         titleSpacing: 12,
         automaticallyImplyLeading: false,
diff --git a/lib/pages/login/login_view.dart b/lib/pages/login/login_view.dart
index 0b660f78..50fa1e38 100644
--- a/lib/pages/login/login_view.dart
+++ b/lib/pages/login/login_view.dart
@@ -14,6 +14,7 @@ class LoginView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return LoginScaffold(
+      enforceMobileMode: Matrix.of(context).client.isLogged(),
       appBar: AppBar(
         leading: controller.loading ? null : const BackButton(),
         automaticallyImplyLeading: !controller.loading,
diff --git a/lib/widgets/layouts/login_scaffold.dart b/lib/widgets/layouts/login_scaffold.dart
index 98b3cd57..bc9e04c2 100644
--- a/lib/widgets/layouts/login_scaffold.dart
+++ b/lib/widgets/layouts/login_scaffold.dart
@@ -6,22 +6,23 @@ import 'package:url_launcher/url_launcher_string.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
-import 'package:fluffychat/widgets/matrix.dart';
 
 class LoginScaffold extends StatelessWidget {
   final Widget body;
   final AppBar? appBar;
+  final bool enforceMobileMode;
 
   const LoginScaffold({
     Key? key,
     required this.body,
     this.appBar,
+    this.enforceMobileMode = false,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    final isMobileMode = Matrix.of(context).client.isLogged() ||
-        !FluffyThemes.isColumnMode(context);
+    final isMobileMode =
+        enforceMobileMode || !FluffyThemes.isColumnMode(context);
     final scaffold = Scaffold(
       key: const Key('LoginScaffold'),
       appBar: appBar == null