Index: Slim/Control/Command.pm
===================================================================
--- Slim/Control/Command.pm	(revision 3527)
+++ Slim/Control/Command.pm	(working copy)
@@ -737,7 +737,7 @@
 				# send xpl message when power toggles
 				if (Slim::Utils::Prefs::get('xplsupport')) {
 					Slim::Control::xPL::sendXplHBeatMsg($client,1);
-                }
+				}
 
 			} elsif ($p1 eq "?") {
 
@@ -755,7 +755,7 @@
 				# send xpl message when power toggles
 				if (Slim::Utils::Prefs::get('xplsupport')) {
 					Slim::Control::xPL::sendXplHBeatMsg($client,1);
-                		}
+				}
 				
 				if ($p1 eq "0") {
 					# Powering off cancels sleep...
@@ -847,7 +847,8 @@
 				
 				Slim::Player::Playlist::reshuffle($client,$load?1:0) if ($load || $add);
 				Slim::Player::Source::jumpto($client, 0) if $load;
-	
+				$client->playmode('playout-play') if ($add && ($client->playmode eq 'playout-stop'));
+				
 				$client->currentPlaylistModified(1) if ($add || $insert || $delete);
 				$client->currentPlaylistChangeTime(time()) if ($load || $add || $insert || $delete);
 				$client->currentPlaylist(undef) if $load;
@@ -1022,6 +1023,7 @@
 				push(@{Slim::Player::Playlist::playList($client)}, @$results);
 
 				Slim::Player::Playlist::reshuffle($client);
+				$client->playmode('playout-play') if $client->playmode eq 'playout-stop';
 				$client->currentPlaylistModified(1);
 				$client->currentPlaylistChangeTime(time());
 			
@@ -1061,8 +1063,9 @@
 				} else {
 					push(@{Slim::Player::Playlist::playList($client)}, parseSearchTerms($client, $p2));
 				}
-
+				
 				Slim::Player::Playlist::reshuffle($client);
+				$client->playmode('playout-play') if $client->playmode eq 'playout-stop';
 				$client->currentPlaylistModified(1);
 				$client->currentPlaylistChangeTime(time());