diff --git a/lib/components/shared/track_table/track_collection_view/track_collection_view.dart b/lib/components/shared/track_table/track_collection_view/track_collection_view.dart
index 78d74fcdb..c0caad966 100644
--- a/lib/components/shared/track_table/track_collection_view/track_collection_view.dart
+++ b/lib/components/shared/track_table/track_collection_view/track_collection_view.dart
@@ -166,9 +166,8 @@ class TrackCollectionView<T> extends HookConsumerWidget {
                   pinned: true,
                   expandedHeight: 400,
                   automaticallyImplyLeading: kIsMobile,
-                  leading: kIsMobile
-                      ? BackButton(color: color?.titleTextColor)
-                      : null,
+                  leading:
+                      kIsMobile ? const BackButton(color: Colors.white) : null,
                   iconTheme: IconThemeData(color: color?.titleTextColor),
                   primary: true,
                   backgroundColor: color?.color,
diff --git a/lib/pages/search/search.dart b/lib/pages/search/search.dart
index de1188663..9d5e7eed6 100644
--- a/lib/pages/search/search.dart
+++ b/lib/pages/search/search.dart
@@ -77,6 +77,7 @@ class SearchPage extends HookConsumerWidget {
                     ),
                     color: theme.scaffoldBackgroundColor,
                     child: TextField(
+                      autofocus: true,
                       decoration: InputDecoration(
                         prefixIcon: const Icon(SpotubeIcons.search),
                         hintText: "${context.l10n.search}...",