diff --git a/lib/entities/media_player/widgets/media_player_widgets.dart b/lib/entities/media_player/widgets/media_player_widgets.dart
index 4fb5019..9f0290e 100644
--- a/lib/entities/media_player/widgets/media_player_widgets.dart
+++ b/lib/entities/media_player/widgets/media_player_widgets.dart
@@ -431,14 +431,10 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
 
   void _duplicateTo(entity) {
     HomeAssistant().savedPlayerPosition = entity.getActualPosition().toInt();
-    if (MediaQuery.of(context).size.width < Sizes.tabletMinWidth) {
-      Navigator.of(context).popAndPushNamed("/play-media", arguments: {"url": entity.attributes["media_content_id"], "type": entity.attributes["media_content_type"]});
-    } else {
-      Navigator.of(context).pushNamed("/play-media", arguments: {
+    Navigator.of(context).pushNamed("/play-media", arguments: {
         "url": entity.attributes["media_content_id"],
         "type": entity.attributes["media_content_type"]
       });
-    }
   }
 
   void _switchTo(entity) {
diff --git a/lib/pages/main.page.dart b/lib/pages/main.page.dart
index 32850a3..e363411 100644
--- a/lib/pages/main.page.dart
+++ b/lib/pages/main.page.dart
@@ -889,9 +889,7 @@ class _MainPageState extends ReceiveShareState<MainPage> with WidgetsBindingObse
         ),
         onWillPop: () {
           if (_entityToShow != null) {
-            setState(() {
-              _entityToShow = null;
-            });
+            eventBus.fire(ShowEntityPageEvent());
             return Future.value(false);
           } else {
             return Future.value(true);