diff --git a/lib/app/view/master_detail_page.dart b/lib/app/view/master_detail_page.dart
index 6a6bfbd1d..2eb912e69 100644
--- a/lib/app/view/master_detail_page.dart
+++ b/lib/app/view/master_detail_page.dart
@@ -77,27 +77,25 @@ class MasterDetailPage extends StatelessWidget with WatchItMixin {
             ),
           if (context.showMasterPanel) const VerticalDivider(),
           Expanded(
-            child: BackGesture(
-              child: Navigator(
-                // ignore: deprecated_member_use
-                onPopPage: (route, result) => route.didPop(result),
-                key: masterNavigator,
-                onGenerateRoute: (settings) {
-                  final page = (masterItems.firstWhereOrNull(
-                            (e) =>
-                                e.pageId == settings.name ||
-                                e.pageId == libraryModel.selectedPageId,
-                          ) ??
-                          masterItems.elementAt(0))
-                      .pageBuilder(context);
+            child: Navigator(
+              initialRoute: libraryModel.selectedPageId ?? kSearchPageId,
+              onDidRemovePage: (page) {},
+              key: libraryModel.masterNavigatorKey,
+              observers: [libraryModel],
+              onGenerateRoute: (settings) {
+                final page = (masterItems.firstWhereOrNull(
+                          (e) => e.pageId == settings.name,
+                        ) ??
+                        masterItems.elementAt(0))
+                    .pageBuilder(context);
 
-                  return PageRouteBuilder(
-                    pageBuilder: (_, __, ___) => page,
-                    transitionsBuilder: (_, a, __, c) =>
-                        FadeTransition(opacity: a, child: c),
-                  );
-                },
-              ),
+                return PageRouteBuilder(
+                  settings: settings,
+                  pageBuilder: (_, __, ___) => BackGesture(child: page),
+                  transitionsBuilder: (_, a, __, c) =>
+                      FadeTransition(opacity: a, child: c),
+                );
+              },
             ),
           ),
         ],
@@ -146,7 +144,7 @@ class MasterPanel extends StatelessWidget {
                         },
                       );
                     } else {
-                      libraryModel.pushNamed(pageId: item.pageId);
+                      libraryModel.push(pageId: item.pageId);
                     }
 
                     if (!context.showMasterPanel) {
diff --git a/lib/common/view/global_keys.dart b/lib/common/view/global_keys.dart
index efa1f5c81..458b503df 100644
--- a/lib/common/view/global_keys.dart
+++ b/lib/common/view/global_keys.dart
@@ -7,4 +7,3 @@ final GlobalKey<NavigatorState> manualAddNavigatorKey =
     GlobalKey<NavigatorState>();
 
 final GlobalKey<ScaffoldState> masterScaffoldKey = GlobalKey();
-final GlobalKey<NavigatorState> masterNavigator = GlobalKey<NavigatorState>();
diff --git a/lib/common/view/sliver_audio_page.dart b/lib/common/view/sliver_audio_page.dart
index 59532dc6b..1b3096019 100644
--- a/lib/common/view/sliver_audio_page.dart
+++ b/lib/common/view/sliver_audio_page.dart
@@ -66,7 +66,7 @@ class SliverAudioPage extends StatelessWidget {
             padding: appBarSingleActionSpacing,
             child: SearchButton(
               onPressed: () {
-                di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: kSearchPageId);
                 final searchModel = di<SearchModel>();
                 if (searchModel.audioType != AudioType.local) {
                   searchModel
diff --git a/lib/library/library_model.dart b/lib/library/library_model.dart
index 323806976..ca136c2f7 100644
--- a/lib/library/library_model.dart
+++ b/lib/library/library_model.dart
@@ -4,11 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:safe_change_notifier/safe_change_notifier.dart';
 
 import '../common/data/audio.dart';
-import '../common/view/global_keys.dart';
+import '../common/logging.dart';
 import '../constants.dart';
 import 'library_service.dart';
 
-class LibraryModel extends SafeChangeNotifier {
+class LibraryModel extends SafeChangeNotifier implements NavigatorObserver {
   LibraryModel(this._service);
 
   final LibraryService _service;
@@ -16,7 +16,6 @@ class LibraryModel extends SafeChangeNotifier {
 
   Future<bool> init() async {
     await _service.init();
-    _pageIdStack.add(_service.selectedPageId ?? kSearchPageId);
 
     _propertiesChangedSub ??=
         _service.propertiesChanged.listen((_) => notifyListeners());
@@ -110,7 +109,7 @@ class LibraryModel extends SafeChangeNotifier {
       playlists.entries.elementAt(index).value.toList();
   List<Audio>? getPlaylistById(String id) => _service.playlists[id];
 
-  bool isPlaylistSaved(String? name) => playlists.containsKey(name);
+  bool isPlaylistSaved(String? id) => _service.isPlaylistSaved(id);
 
   Future<void> addPlaylist(String name, List<Audio> audios) async =>
       _service.addPlaylist(name, audios);
@@ -208,46 +207,21 @@ class LibraryModel extends SafeChangeNotifier {
     pop();
   }
 
-  final List<String> _pageIdStack = [];
-  String? get selectedPageId => _pageIdStack.lastOrNull;
-  Future<void> pushNamed({required String pageId, bool replace = false}) async {
-    if (pageId == _pageIdStack.lastOrNull) return;
-    _putOnStack(pageId: pageId, replace: replace);
-    if (replace) {
-      await masterNavigator.currentState?.pushReplacementNamed(pageId);
-    } else {
-      await masterNavigator.currentState?.pushNamed(pageId);
-    }
-  }
+  /// Navigation inside the Library
 
-  void _putOnStack({
-    required String pageId,
-    bool replace = false,
-  }) {
-    if (replace) {
-      _pageIdStack.last = pageId;
-    } else {
-      _pageIdStack.add(pageId);
-    }
-
-    if (isPageInLibrary(pageId)) {
-      _service.setSelectedPageId(pageId);
-    }
-    notifyListeners();
-  }
-
-  bool get canPop => _pageIdStack.length > 1;
+  String? get selectedPageId => _service.selectedPageId;
+  void _setSelectedPageId(String pageId) => _service.setSelectedPageId(pageId);
 
   Future<void> push({
-    required Widget Function(BuildContext) builder,
     required String pageId,
+    Widget Function(BuildContext)? builder,
     bool maintainState = false,
-    bool replace = false,
   }) async {
-    if (isPageInLibrary(pageId)) {
-      await pushNamed(pageId: pageId, replace: replace);
-    } else {
-      _putOnStack(pageId: pageId, replace: replace);
+    final inLibrary = isPageInLibrary(pageId);
+    assert(inLibrary || builder != null);
+    if (inLibrary) {
+      await _masterNavigatorKey.currentState?.pushNamed(pageId);
+    } else if (builder != null) {
       final materialPageRoute = MaterialPageRoute(
         builder: builder,
         maintainState: maintainState,
@@ -255,36 +229,73 @@ class LibraryModel extends SafeChangeNotifier {
           name: pageId,
         ),
       );
-      if (replace) {
-        await masterNavigator.currentState?.pushReplacement(
-          materialPageRoute,
-        );
-      } else {
-        await masterNavigator.currentState?.push(
-          materialPageRoute,
-        );
-      }
+      await _masterNavigatorKey.currentState?.push(
+        materialPageRoute,
+      );
     }
   }
 
-  void pop({bool popStack = true}) {
-    if (_pageIdStack.length > 1 && popStack) {
-      _pageIdStack.removeLast();
+  void pop() => _masterNavigatorKey.currentState?.maybePop();
 
-      notifyListeners();
-    }
-    masterNavigator.currentState?.maybePop();
+  bool get canPop => _masterNavigatorKey.currentState?.canPop() == true;
+
+  bool isPageInLibrary(String? pageId) => _service.isPageInLibrary(pageId);
+
+  @override
+  void didPop(Route route, Route? previousRoute) {
+    final pageId = previousRoute?.settings.name;
+
+    printMessageInDebugMode(
+      'didPop: ${route.settings.name}, previousPageId: ${previousRoute?.settings.name}',
+    );
+    if (pageId == null) return;
+    _setSelectedPageId(pageId);
   }
 
-  bool isPageInLibrary(String? pageId) =>
-      pageId != null &&
-      (pageId == kSearchPageId ||
-          pageId == kLikedAudiosPageId ||
-          pageId == kLocalAudioPageId ||
-          pageId == kPodcastsPageId ||
-          pageId == kRadioPageId ||
-          isPinnedAlbum(pageId) ||
-          isStarredStation(pageId) ||
-          isPlaylistSaved(pageId) ||
-          isPodcastSubscribed(pageId));
+  @override
+  void didPush(Route route, Route? previousRoute) {
+    final pageId = route.settings.name;
+    printMessageInDebugMode(
+      'didPush: $pageId, previousPageId: ${previousRoute?.settings.name}',
+    );
+    if (pageId == null) return;
+    _setSelectedPageId(pageId);
+  }
+
+  @override
+  void didRemove(Route route, Route? previousRoute) {
+    final pageId = route.settings.name;
+    printMessageInDebugMode(
+      'didRemove: $pageId, previousPageId: ${previousRoute?.settings.name}',
+    );
+    if (pageId == null) return;
+    _setSelectedPageId(pageId);
+  }
+
+  @override
+  void didReplace({Route? newRoute, Route? oldRoute}) {
+    printMessageInDebugMode(
+      'didReplace: ${oldRoute?.settings.name}, newPageId: ${newRoute?.settings.name}',
+    );
+  }
+
+  @override
+  void didStartUserGesture(Route route, Route? previousRoute) {
+    printMessageInDebugMode(
+      'didStartUserGesture: ${route.settings.name}, previousPageId: ${previousRoute?.settings.name}',
+    );
+  }
+
+  @override
+  void didStopUserGesture() {
+    printMessageInDebugMode('didStopUserGesture');
+  }
+
+  // Note: Navigator.initState ensures assert(observer.navigator == null);
+  // Afterwards the Navigator itself!!! sets the navigator of its observers...
+  @override
+  NavigatorState? get navigator => null;
+  final GlobalKey<NavigatorState> _masterNavigatorKey =
+      GlobalKey<NavigatorState>();
+  GlobalKey<NavigatorState> get masterNavigatorKey => _masterNavigatorKey;
 }
diff --git a/lib/library/library_service.dart b/lib/library/library_service.dart
index b9a80df74..a59591d0f 100644
--- a/lib/library/library_service.dart
+++ b/lib/library/library_service.dart
@@ -186,6 +186,8 @@ class LibraryService {
 
   Map<String, List<Audio>> _playlists = {};
   Map<String, List<Audio>> get playlists => _playlists;
+  bool isPlaylistSaved(String? id) =>
+      id == null ? false : _playlists.containsKey(id);
 
   Future<void> addPlaylist(String id, List<Audio> audios) async {
     if (!_playlists.containsKey(id)) {
@@ -371,11 +373,12 @@ class LibraryService {
   }
 
   Map<String, List<Audio>> _podcasts = {};
+  bool isPodcastSubscribed(String feedUrl) => _podcasts.containsKey(feedUrl);
   Map<String, List<Audio>> get podcasts => _podcasts;
   int get podcastsLength => _podcasts.length;
 
   void addPodcast(String feedUrl, List<Audio> audios) {
-    if (_podcasts.containsKey(feedUrl)) return;
+    if (isPodcastSubscribed(feedUrl)) return;
     _podcasts.putIfAbsent(feedUrl, () => audios);
     writeAudioMap(_podcasts, kPodcastsFileName)
         .then((_) => _propertiesChangedController.add(true));
@@ -442,13 +445,13 @@ class LibraryService {
         .then((_) => _propertiesChangedController.add(true));
   }
 
-  void removePodcast(String name) {
-    if (!_podcasts.containsKey(name)) return;
-    _podcasts.remove(name);
+  void removePodcast(String feedUrl) {
+    if (!isPodcastSubscribed(feedUrl)) return;
+    _podcasts.remove(feedUrl);
     writeAudioMap(_podcasts, kPodcastsFileName)
         .then((_) => _propertiesChangedController.add(true))
-        .then((_) => removePodcastUpdate(name))
-        .then((_) => _removeFeedWithDownload(name));
+        .then((_) => removePodcastUpdate(feedUrl))
+        .then((_) => _removeFeedWithDownload(feedUrl));
   }
 
   //
@@ -503,11 +506,30 @@ class LibraryService {
   }
 
   String? get selectedPageId => _sharedPreferences.getString(kSelectedPageId);
-  Future<void> setSelectedPageId(String value) {
-    return _sharedPreferences.setString(kSelectedPageId, value);
+  Future<void> setSelectedPageId(String value) async {
+    final success = await _sharedPreferences.setString(kSelectedPageId, value);
+    if (success) {
+      _propertiesChangedController.add(true);
+    }
   }
 
   Future<void> dispose() async {
     await _propertiesChangedController.close();
   }
+
+  bool isPageInLibrary(String? pageId) =>
+      pageId != null &&
+      (_mainPages.contains(pageId) ||
+          isPinnedAlbum(pageId) ||
+          isStarredStation(pageId) ||
+          isPlaylistSaved(pageId) ||
+          isPodcastSubscribed(pageId));
+
+  final _mainPages = [
+    kSearchPageId,
+    kLikedAudiosPageId,
+    kLocalAudioPageId,
+    kPodcastsPageId,
+    kRadioPageId,
+  ];
 }
diff --git a/lib/local_audio/view/album_page.dart b/lib/local_audio/view/album_page.dart
index 3c90bb489..c985aa181 100644
--- a/lib/local_audio/view/album_page.dart
+++ b/lib/local_audio/view/album_page.dart
@@ -58,6 +58,7 @@ class AlbumPage extends StatelessWidget {
       pageTitle: album.firstWhereOrNull((e) => e.album != null)?.album,
       pageSubTitle: album.firstWhereOrNull((e) => e.artist != null)?.artist,
       onPageSubTitleTab: onArtistTap,
+      onPageLabelTab: onArtistTap,
       controlPanel: AlbumPageControlButton(album: album, id: id),
     );
   }
diff --git a/lib/local_audio/view/artist_page.dart b/lib/local_audio/view/artist_page.dart
index 3de8cadd5..5a7aa8d25 100644
--- a/lib/local_audio/view/artist_page.dart
+++ b/lib/local_audio/view/artist_page.dart
@@ -77,7 +77,7 @@ class ArtistPage extends StatelessWidget with WatchItMixin {
             padding: appBarSingleActionSpacing,
             child: SearchButton(
               onPressed: () {
-                di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: kSearchPageId);
                 final searchmodel = di<SearchModel>();
                 searchmodel
                   ..setAudioType(AudioType.local)
diff --git a/lib/local_audio/view/genre_page.dart b/lib/local_audio/view/genre_page.dart
index 7c98cdcb8..12345fdb9 100644
--- a/lib/local_audio/view/genre_page.dart
+++ b/lib/local_audio/view/genre_page.dart
@@ -59,7 +59,7 @@ class _GenrePageState extends State<GenrePage> {
             IconButton(
               tooltip: context.l10n.searchForRadioStationsWithGenreName,
               onPressed: () => radioModel.init().then((value) {
-                di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: kSearchPageId);
                 di<SearchModel>()
                   ..setTag(
                     Tag(name: widget.genre.toLowerCase(), stationCount: 1),
diff --git a/lib/local_audio/view/local_audio_page.dart b/lib/local_audio/view/local_audio_page.dart
index 0e8b413ae..bd2884639 100644
--- a/lib/local_audio/view/local_audio_page.dart
+++ b/lib/local_audio/view/local_audio_page.dart
@@ -66,7 +66,7 @@ class _LocalAudioPageState extends State<LocalAudioPage> {
             child: SearchButton(
               active: false,
               onPressed: () {
-                di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: kSearchPageId);
                 final searchmodel = di<SearchModel>();
                 searchmodel
                   ..setAudioType(AudioType.local)
diff --git a/lib/playlists/view/add_to_playlist_snack_bar.dart b/lib/playlists/view/add_to_playlist_snack_bar.dart
index fe6f276cf..8f5c4cb58 100644
--- a/lib/playlists/view/add_to_playlist_snack_bar.dart
+++ b/lib/playlists/view/add_to_playlist_snack_bar.dart
@@ -26,7 +26,7 @@ ScaffoldFeatureController<SnackBar, SnackBarClosedReason>
           if (appModel.fullWindowMode == true) {
             appModel.setFullWindowMode(false);
           }
-          libraryModel.pushNamed(pageId: id);
+          libraryModel.push(pageId: id);
         },
         label: context.l10n.open,
       ),
diff --git a/lib/playlists/view/manual_add_dialog.dart b/lib/playlists/view/manual_add_dialog.dart
index 8c9aec733..da3828840 100644
--- a/lib/playlists/view/manual_add_dialog.dart
+++ b/lib/playlists/view/manual_add_dialog.dart
@@ -224,7 +224,7 @@ class _PlaylistContentState extends State<PlaylistContent> {
                     di<LocalAudioModel>().localAudioindex =
                         LocalAudioView.playlists.index;
                     widget.libraryModel
-                      ..pushNamed(pageId: kLocalAudioPageId)
+                      ..push(pageId: kLocalAudioPageId)
                       ..updatePlaylistName(
                         widget.playlistName!,
                         _controller.text,
@@ -253,7 +253,7 @@ class _PlaylistContentState extends State<PlaylistContent> {
                               const Duration(milliseconds: 300),
                             );
                             await widget.libraryModel
-                                .pushNamed(pageId: _controller.text);
+                                .push(pageId: _controller.text);
                           });
                         },
                   child: Text(
diff --git a/lib/playlists/view/playlist_page.dart b/lib/playlists/view/playlist_page.dart
index d8d24ffb1..f9bf09a14 100644
--- a/lib/playlists/view/playlist_page.dart
+++ b/lib/playlists/view/playlist_page.dart
@@ -97,7 +97,7 @@ class PlaylistPage extends StatelessWidget with WatchItMixin {
               padding: appBarSingleActionSpacing,
               child: SearchButton(
                 onPressed: () {
-                  di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                  di<LibraryModel>().push(pageId: kSearchPageId);
                   final searchmodel = di<SearchModel>();
                   searchmodel
                     ..setAudioType(AudioType.local)
diff --git a/lib/podcasts/podcast_model.dart b/lib/podcasts/podcast_model.dart
index 3789b442f..6a73dafa9 100644
--- a/lib/podcasts/podcast_model.dart
+++ b/lib/podcasts/podcast_model.dart
@@ -89,7 +89,7 @@ class PodcastModel extends SafeChangeNotifier {
     PlayerModel? playerModel,
   }) async {
     if (libraryModel.isPageInLibrary(feedUrl)) {
-      return libraryModel.pushNamed(pageId: feedUrl);
+      return libraryModel.push(pageId: feedUrl);
     }
 
     showSnackBar(
diff --git a/lib/podcasts/view/podcast_page.dart b/lib/podcasts/view/podcast_page.dart
index 185b8e536..228196623 100644
--- a/lib/podcasts/view/podcast_page.dart
+++ b/lib/podcasts/view/podcast_page.dart
@@ -107,7 +107,7 @@ class _PodcastPageState extends State<PodcastPage> {
             padding: appBarSingleActionSpacing,
             child: SearchButton(
               onPressed: () {
-                di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: kSearchPageId);
                 di<SearchModel>()
                   ..setAudioType(AudioType.podcast)
                   ..setSearchType(SearchType.podcastTitle);
@@ -204,7 +204,7 @@ class _PodcastPageState extends State<PodcastPage> {
     required String text,
   }) async {
     await di<PodcastModel>().init(updateMessage: context.l10n.updateAvailable);
-    di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+    di<LibraryModel>().push(pageId: kSearchPageId);
     di<SearchModel>()
       ..setAudioType(AudioType.podcast)
       ..setSearchQuery(text)
@@ -225,7 +225,7 @@ class _PodcastPageState extends State<PodcastPage> {
           e.id.toLowerCase() == text.toLowerCase() ||
           e.name.toLowerCase() == text.toLowerCase(),
     );
-    di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+    di<LibraryModel>().push(pageId: kSearchPageId);
     if (genreOrNull != null) {
       di<SearchModel>()
         ..setAudioType(AudioType.podcast)
diff --git a/lib/podcasts/view/podcasts_collection_body.dart b/lib/podcasts/view/podcasts_collection_body.dart
index c58f6bb12..29b486664 100644
--- a/lib/podcasts/view/podcasts_collection_body.dart
+++ b/lib/podcasts/view/podcasts_collection_body.dart
@@ -63,7 +63,7 @@ class PodcastsCollectionBody extends StatelessWidget with WatchItMixin {
             ),
             ImportantButton(
               onPressed: () {
-                di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: kSearchPageId);
                 di<SearchModel>()
                   ..setAudioType(AudioType.podcast)
                   ..setSearchQuery(null)
@@ -159,8 +159,7 @@ class PodcastsCollectionBody extends StatelessWidget with WatchItMixin {
                                 podcast.key,
                               ),
                             ),
-                        onTap: () =>
-                            libraryModel.pushNamed(pageId: podcast.key),
+                        onTap: () => libraryModel.push(pageId: podcast.key),
                       );
                     },
                   ),
diff --git a/lib/podcasts/view/podcasts_page.dart b/lib/podcasts/view/podcasts_page.dart
index 6225949f7..66bbaf139 100644
--- a/lib/podcasts/view/podcasts_page.dart
+++ b/lib/podcasts/view/podcasts_page.dart
@@ -45,7 +45,7 @@ class _PodcastsPageState extends State<PodcastsPage> {
             child: SearchButton(
               onPressed: () {
                 final searchModel = di<SearchModel>();
-                di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: kSearchPageId);
                 if (searchModel.audioType != AudioType.podcast) {
                   searchModel
                     ..setAudioType(AudioType.podcast)
diff --git a/lib/radio/view/open_radio_discover_page_button.dart b/lib/radio/view/open_radio_discover_page_button.dart
index 858957fdf..ad9ca9dc9 100644
--- a/lib/radio/view/open_radio_discover_page_button.dart
+++ b/lib/radio/view/open_radio_discover_page_button.dart
@@ -15,7 +15,7 @@ class OpenRadioSearchButton extends StatelessWidget with WatchItMixin {
   Widget build(BuildContext context) {
     return ImportantButton(
       onPressed: () {
-        di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+        di<LibraryModel>().push(pageId: kSearchPageId);
         di<SearchModel>()
           ..setAudioType(AudioType.radio)
           ..search();
diff --git a/lib/radio/view/radio_lib_page.dart b/lib/radio/view/radio_lib_page.dart
index 640345362..a6ca85f55 100644
--- a/lib/radio/view/radio_lib_page.dart
+++ b/lib/radio/view/radio_lib_page.dart
@@ -176,7 +176,7 @@ class TagGrid extends StatelessWidget with WatchItMixin {
               ),
               bottom: AudioCardBottom(text: tag),
               onTap: () {
-                di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: kSearchPageId);
                 di<SearchModel>()
                   ..setTag(Tag(name: tag.toLowerCase(), stationCount: 1))
                   ..setAudioType(AudioType.radio)
diff --git a/lib/radio/view/radio_page.dart b/lib/radio/view/radio_page.dart
index 6ccf340b8..febef50e6 100644
--- a/lib/radio/view/radio_page.dart
+++ b/lib/radio/view/radio_page.dart
@@ -34,7 +34,7 @@ class RadioPage extends StatelessWidget with WatchItMixin {
               child: SearchButton(
                 active: false,
                 onPressed: () {
-                  di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                  di<LibraryModel>().push(pageId: kSearchPageId);
                   final searchModel = di<SearchModel>();
                   if (searchModel.audioType != AudioType.radio) {
                     searchModel
diff --git a/lib/radio/view/radio_page_tag_bar.dart b/lib/radio/view/radio_page_tag_bar.dart
index 6e54ebb05..e7a5e6027 100644
--- a/lib/radio/view/radio_page_tag_bar.dart
+++ b/lib/radio/view/radio_page_tag_bar.dart
@@ -78,7 +78,7 @@ class RadioPageTagBar extends StatelessWidget {
                   di<RadioModel>().init().then(
                     (connectedHost) {
                       if (connectedHost != null) {
-                        di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                        di<LibraryModel>().push(pageId: kSearchPageId);
                         di<SearchModel>()
                           ..setTag(Tag(name: e, stationCount: 1))
                           ..setAudioType(AudioType.radio)
diff --git a/lib/radio/view/station_page.dart b/lib/radio/view/station_page.dart
index 5ed030335..406b6b3a1 100644
--- a/lib/radio/view/station_page.dart
+++ b/lib/radio/view/station_page.dart
@@ -46,7 +46,7 @@ class StationPage extends StatelessWidget with WatchItMixin {
             padding: appBarSingleActionSpacing,
             child: SearchButton(
               onPressed: () {
-                di<LibraryModel>().pushNamed(pageId: kSearchPageId);
+                di<LibraryModel>().push(pageId: kSearchPageId);
                 final searchModel = di<SearchModel>();
                 if (searchModel.audioType != AudioType.radio) {
                   searchModel