Index: Slim/Control/Commands.pm
===================================================================
--- Slim/Control/Commands.pm	(revision 25151)
+++ Slim/Control/Commands.pm	(working copy)
@@ -1343,11 +1343,6 @@
 
 		$client->currentPlaylistModified(0);
 
-		# on players with VFD push into the Now Playing mode
-		if ($client->isPlayer && !$client->display->isa('Slim::Display::NoDisplay')) {
-			Slim::Buttons::Common::pushMode($client, 'screensaver');
-		}
-
 	} elsif ($cmd =~ /^(add|append)$/) {
 
 		$client->currentPlaylist( Slim::Utils::Misc::fixPath($path) );
@@ -1614,11 +1609,6 @@
 		$client->execute( [ 'playlist', 'jump', $jumpToIndex, $fadeIn ] );
 		
 		$client->currentPlaylistModified(0);
-
-		# on players with VFD push into the Now Playing mode
-		if ($client->isPlayer && !$client->display->isa('Slim::Display::NoDisplay')) {
-			Slim::Buttons::Common::pushMode($client, 'screensaver');
-		}
 	}
 
 	if ($add || $insert || $delete) {
Index: Slim/Buttons/BrowseDB.pm
===================================================================
--- Slim/Buttons/BrowseDB.pm	(revision 25151)
+++ Slim/Buttons/BrowseDB.pm	(working copy)
@@ -183,11 +183,14 @@
 				$line2 = $client->modeParam('itemTitle') || browsedbItemName($client, $currentItem);
 			}
 
-			$client->showBriefly({
-				'line'    => [ $line1, $line2 ],
-				'overlay' => [ undef, $client->symbols('notesymbol') ],
-			});
+			if ($addorinsert == 1 || $addorinsert == 2) {
 
+				$client->showBriefly({
+					'line'    => [ $line1, $line2 ],
+					'overlay' => [ undef, $client->symbols('notesymbol') ],
+				});
+			}
+
 			# Include the current item
 			if ($levelName ne 'track' && !$all) {
 
@@ -271,6 +274,10 @@
 					}
 				}
 			}
+			
+			if ($addorinsert == 0) {
+				Slim::Buttons::Common::pushModeLeft($client, 'playlist');
+			}
 		},
 
 		'create_mix' => sub  {
Index: Slim/Buttons/Playlist.pm
===================================================================
--- Slim/Buttons/Playlist.pm	(revision 25151)
+++ Slim/Buttons/Playlist.pm	(working copy)
@@ -158,22 +158,7 @@
 		'left' => sub  {
 			my $client = shift;
 
-			my $oldlines = $client->curLines();
-
-			Slim::Buttons::Home::jump($client, 'NOW_PLAYING');
-
-			while (Slim::Buttons::Common::popMode($client, 1)) {};
-
-			Slim::Buttons::Common::pushMode($client, 'home');
-
-			if ($client->display->showExtendedText()) {
-
-				$client->pushRight($oldlines, Slim::Buttons::Common::pushpopScreen2($client, 'playlist', $client->curLines({ trans => 'pushModeRight' })));
-
-			} else {
-
-				$client->pushRight($oldlines, $client->curLines({ trans => 'pushModeRight' }));
-			}
+			Slim::Buttons::Common::popModeRight($client);
 		},
 
 		'right' => sub  {