=== applets/SlimBrowser/SlimBrowserApplet.lua
==================================================================
--- applets/SlimBrowser/SlimBrowserApplet.lua	(revision 50441)
+++ applets/SlimBrowser/SlimBrowserApplet.lua	(local)
@@ -3661,19 +3661,7 @@
 		appletManager:callService("hideNowPlaying")
 
 		return
-	-- make sure we have step.window replace emptyStep.window when there are tracks and emptyStep exists
-	elseif _player:isPowerOn() and playlistSize then
-		-- only move into NowPlaying if screensaver is allowed
-		if Window:getTopNonTransientWindow():canActivateScreensaver() then
-			_goNowPlaying(nil, true)
-		end
-		if emptyStep and emptyStep.window then
-			emptyStep.window:hide()
-		end
-		_emptyStep = nil
-	
 	end
-
 	-- update the window
 	step.db:updateStatus(playerStatus)
 	step.menu:reLayout()
@@ -3696,8 +3684,21 @@
 	end
 
 	local playerStatus = player:getPlayerStatus()
+	local playlistSize = _player:getPlaylistSize()
 	local step = _statusStep
 
+	if _player:isPowerOn() and playlistSize then
+		-- only move into NowPlaying if screensaver is allowed 
+		if Window:getTopNonTransientWindow():canActivateScreensaver() then
+			_goNowPlaying(nil, true)
+		end
+		-- make sure we have step.window replace emptyStep.window when there are tracks and emptyStep exists
+		if emptyStep and emptyStep.window then
+			emptyStep.window:hide()
+		end
+		_emptyStep = nil
+	end
+
 	step.db:updateStatus(playerStatus)
 	if step.db:playlistIndex() then
 		step.menu:setSelectedIndex(step.db:playlistIndex())
@@ -3812,6 +3813,7 @@
 		_statusSink
 	)
 	_statusStep = step
+	_statusStep.window:setAllowScreensaver(false)
 	
 	-- make sure it has our modifier (so that we use different default action in Now Playing)
 	_statusStep.actionModifier = "-status"