diff --git a/src/components/remotecontrol.js b/src/components/remotecontrol.js
index 58e69961e7..76f0d673d0 100644
--- a/src/components/remotecontrol.js
+++ b/src/components/remotecontrol.js
@@ -429,6 +429,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
             if (!state.NextMediaType) {
                 updatePlayerState(player, dlg, {});
                 loadPlaylist(dlg);
+                Emby.Page.back();
             }
         }