--- Buttons/Common.pm.original	2007-11-11 13:49:31.000000000 +0000
+++ Buttons/Common.pm	2007-11-11 13:49:31.000000000 +0000
@@ -649,17 +649,18 @@
 		if ($buttonarg eq 'toggle') {
 
 			$::d_ui && msg("Switching to playlist view\n");
 
+			Slim::Buttons::Common::setMode($client, 'home');
+			Slim::Buttons::Home::jump($client, 'playlist');
+			Slim::Buttons::Common::pushModeLeft($client, 'playlist');
+
 			if (Slim::Player::Playlist::count($client) == 0) {
 
 				$client->showBriefly($client->string('PLAYLIST_EMPTY'), "");
 
 			} else {
 
-				Slim::Buttons::Common::setMode($client, 'home');
-				Slim::Buttons::Home::jump($client, 'playlist');
-				Slim::Buttons::Common::pushModeLeft($client, 'playlist');
 			}
 
 		} elsif ($buttonarg =~ /^[0-5]$/) {