diff --git a/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart
index 3712a3d6..9cfbf911 100644
--- a/lib/pages/homeserver_picker/homeserver_picker.dart
+++ b/lib/pages/homeserver_picker/homeserver_picker.dart
@@ -192,7 +192,9 @@ class HomeserverPickerController extends State<HomeserverPicker> {
     return cachedHomeservers = homeserverList;
   }
 
-  void login() => context.go('/home/login');
+  void login() => context.push(
+        '${GoRouter.of(context).routeInformationProvider.value.uri.path}/login',
+      );
 
   @override
   void initState() {