Index: IR/Default.map
===================================================================
--- IR/Default.map	(revision 3106)
+++ IR/Default.map	(working copy)
@@ -331,6 +331,8 @@
 search.*					= passback
 stop.*						= passback
 pause.*						= passback
+now_playing					= passback
+search						= passback
 
 [INPUT.Choice]
 arrow_left					= exit_left
Index: Slim/Buttons/Input/List.pm
===================================================================
--- Slim/Buttons/Input/List.pm	(revision 3106)
+++ Slim/Buttons/Input/List.pm	(working copy)
@@ -66,6 +66,7 @@
 	,'passback' => sub {
 			my ($client,$funct,$functarg) = @_;
 			my $parentMode = $client->param('parentMode');
+			exitInput($client,'passback');
 			if (defined($parentMode)) {
 				Slim::Hardware::IR::executeButton($client,$client->lastirbutton,$client->lastirtime,$parentMode);
 			}
Index: Slim/Buttons/Playlist.pm
===================================================================
--- Slim/Buttons/Playlist.pm	(revision 3106)
+++ Slim/Buttons/Playlist.pm	(working copy)
@@ -89,7 +89,7 @@
 		'left' => sub  {
 			my $client = shift;
 			my @oldlines = Slim::Display::Display::curLines($client);
-			Slim::Buttons::Home::jump($client, 'NOW_PLAYING');
+			#Slim::Buttons::Home::jump($client, 'NOW_PLAYING');
 			Slim::Buttons::Common::setMode($client, 'home');
 			$client->pushRight(\@oldlines, [Slim::Display::Display::curLines($client)]);
 		},
Index: Slim/Buttons/BrowseDB.pm
===================================================================
--- Slim/Buttons/BrowseDB.pm	(revision 3106)
+++ Slim/Buttons/BrowseDB.pm	(working copy)
@@ -345,8 +345,9 @@
 		else {
 			Slim::Buttons::Common::pushModeLeft($client, 'trackinfo', { 'track' => $currentItem });
 		}
-	}
-	else {
+	} elsif ($exittype eq 'PASSBACK') {
+		Slim::Buttons::Common::popMode($client);
+	} else {
 		$client->bumpRight();
 	}
 }