diff --git a/lib/components/library/local_folder/local_folder_item.dart b/lib/components/library/local_folder/local_folder_item.dart
index 281cfc2c..556f09a6 100644
--- a/lib/components/library/local_folder/local_folder_item.dart
+++ b/lib/components/library/local_folder/local_folder_item.dart
@@ -11,6 +11,7 @@ import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/extensions/image.dart';
 import 'package:spotube/hooks/utils/use_brightness_value.dart';
+import 'package:spotube/pages/library/local_folder.dart';
 import 'package:spotube/provider/local_tracks/local_tracks_provider.dart';
 import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
 
@@ -57,14 +58,13 @@ class LocalFolderItem extends HookConsumerWidget {
 
     return InkWell(
       onTap: () {
-        if (isDownloadFolder) {
-          context.go("/library/local?downloads=1", extra: folder);
-        } else {
-          context.go(
-            "/library/local",
-            extra: folder,
-          );
-        }
+        context.goNamed(
+          LocalLibraryPage.name,
+          queryParameters: {
+            if (isDownloadFolder) "downloads": 1,
+          },
+          extra: folder,
+        );
       },
       borderRadius: BorderRadius.circular(8),
       child: Ink(
diff --git a/lib/pages/getting_started/sections/support.dart b/lib/pages/getting_started/sections/support.dart
index ec29de24..7bccfe06 100644
--- a/lib/pages/getting_started/sections/support.dart
+++ b/lib/pages/getting_started/sections/support.dart
@@ -5,6 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/getting_started/blur_card.dart';
 import 'package:spotube/extensions/context.dart';
+import 'package:spotube/pages/home/home.dart';
 import 'package:spotube/pages/mobile_login/mobile_login.dart';
 import 'package:spotube/services/kv_store/kv_store.dart';
 import 'package:url_launcher/url_launcher_string.dart';
@@ -105,7 +106,7 @@ class GettingStartedScreenSupportSection extends HookConsumerWidget {
                     onPressed: () async {
                       await KVStoreService.setDoneGettingStarted(true);
                       if (context.mounted) {
-                        context.go("/");
+                        context.go(HomePage.name);
                       }
                     },
                   ),