diff --git a/content/Gui.qml b/content/Gui.qml
index adb6a096..3d1b9773 100644
--- a/content/Gui.qml
+++ b/content/Gui.qml
@@ -609,13 +609,23 @@ Item
         {
             updateScreenDim();
 
-            if (player.isPlaying == false)
+            if (player.isPlaying)
             {
-                restoreBars();
+                sk.screenSaverEnabled = false;
+
+                return;
+            }
 
-                sk.screenSaverEnabled = true;
+            if (player.isStopped && playerBrowser.visible)
+            {
+                var playlist = pGetCurrentPlaylist();
+
+                if (playlist) setCurrentTrack(playlist, playlist.lastSelected);
             }
-            else sk.screenSaverEnabled = false;
+
+            restoreBars();
+
+            sk.screenSaverEnabled = true;
         }
 
         onHasStartedChanged: