Index: Slim/Buttons/Playlist.pm
===================================================================
--- Slim/Buttons/Playlist.pm	(revision 2722)
+++ Slim/Buttons/Playlist.pm	(working copy)
@@ -235,9 +235,10 @@
 	my $client = shift;
 
 	return (
-		(Slim::Buttons::Common::mode($client) eq 'screensaver') || 
-		(Slim::Buttons::Common::mode($client) eq 'playlist') && 
-			(browseplaylistindex($client) == Slim::Player::Source::playingSongIndex($client))
+		defined Slim::Buttons::Common::mode($client) &&
+		((Slim::Buttons::Common::mode($client) eq 'screensaver') || 
+		((Slim::Buttons::Common::mode($client) eq 'playlist') && 
+			((browseplaylistindex($client) || 0) == Slim::Player::Source::playingSongIndex($client))))
 	);
 }