Index: Plugin/RandomPlay/Plugin.pm
===================================================================
--- Plugin/RandomPlay/Plugin.pm	(revision 14941)
+++ Plugin/RandomPlay/Plugin.pm	(working copy)
@@ -356,6 +356,10 @@
 		));
 	}
 
+	# temporarily turn off shuffle while we add new stuff
+	my $oldshuffle = Slim::Player::Playlist::shuffle($client);
+	Slim::Player::Playlist::shuffle($client, 0);
+
 	# Replace the current playlist with the first item / track or add it to end
 	my $request = $client->execute([
 		'playlist', $addOnly ? 'addtracks' : 'loadtracks', sprintf('%s.id=%d', $type, $obj->id)
@@ -379,6 +383,7 @@
 		}
 	}
 
+	Slim::Player::Playlist::shuffle($client, $oldshuffle);
 	return $obj->name;
 }
 
@@ -528,8 +533,6 @@
 			$client->execute(['power', '1']);
 		}
 
-		Slim::Player::Playlist::shuffle($client, 0);
-
 		my $find = {};
 
 		# Initialize find to only include user's selected genres.  If they've deselected