--- Slim/Buttons/BrowseTree.pm	2005-07-19 14:56:37.765625000 -0700
+++ Slim/Buttons/BrowseTree.pm.new	2005-07-19 14:52:32.671875000 -0700
@@ -79,13 +79,14 @@ sub init {
 				1
 			);
 
-			if ($descend || !Slim::Utils::Prefs::get('playtrackalbum')) {
+			# regular command if its a descendable folder, or if the play all pref is not set, or the button was not PLAY
+			if ($descend || (!Slim::Utils::Prefs::get('playtrackalbum') && !$addorinsert)) {
 
 				$client->execute(['playlist', $command, $currentItem]);
 
 			} else {
 
-				$command .= 'tracks';
+				$command = 'playtracks';
 				my $wasShuffled = Slim::Player::Playlist::shuffle($client);
 
 				Slim::Player::Playlist::shuffle($client, 0);