--- Slim/Buttons/Common.pm.orig	2011-07-25 18:07:09.000000000 +0100
+++ Slim/Buttons/Common.pm	2012-02-20 15:07:23.000000000 +0000
@@ -407,7 +407,10 @@
 
 			$client->execute(["stop"]);
 
-			Slim::Buttons::Common::pushMode($client, 'playlist');
+			# Push into playlist, unless already there 
+			unless (mode($client) eq 'playlist') {
+				Slim::Buttons::Common::pushMode($client, 'playlist');
+			}
 
 			$client->showBriefly( {
 				'line' => [ "", $client->string('STOPPING') ],