Index: Slim/Buttons/Common.pm
===================================================================
--- Slim/Buttons/Common.pm	(revision 3986)
+++ Slim/Buttons/Common.pm	(working copy)
@@ -466,7 +466,7 @@
 		my $client = shift;
 		my $button = shift;
 		my $power= undef;
-		$client->execute(["stop"]);
+		
 		if ($button eq 'power_on') {
 			$client->execute(["power",1]);
 		} elsif ($button eq 'power_off') {
Index: Slim/Control/Command.pm
===================================================================
--- Slim/Control/Command.pm	(revision 3986)
+++ Slim/Control/Command.pm	(working copy)
@@ -647,6 +647,7 @@
 
 			if (defined($p1)) {
 				if ($p1 && Slim::Player::Source::playmode($client) eq "play") {
+					$client->rate(1);
 					Slim::Player::Source::playmode($client, "pause");
 				} elsif (!$p1 && Slim::Player::Source::playmode($client) eq "pause") {
 					Slim::Player::Source::playmode($client, "resume");
@@ -657,6 +658,7 @@
 				if (Slim::Player::Source::playmode($client) eq "pause") {
 					Slim::Player::Source::playmode($client, "resume");
 				} elsif (Slim::Player::Source::playmode($client) eq "play") {
+					$client->rate(1);
 					Slim::Player::Source::playmode($client, "pause");
 				} elsif (Slim::Player::Source::playmode($client) eq "stop") {
 					Slim::Player::Source::playmode($client, "play");