Index: Slim/Buttons/Common.pm
===================================================================
--- Slim/Buttons/Common.pm	(revision 9034)
+++ Slim/Buttons/Common.pm	(working copy)
@@ -517,7 +517,11 @@
 		my $buttonarg = shift;
 		my $playdisp = undef;
 
-		if (mode($client) ne 'search') {
+		# Repeat presses of 'search' will step through search menu
+		if ($client->curSelection($client->curDepth) eq 'SEARCH' && mode($client) eq 'INPUT.List') {
+			(Slim::Buttons::Input::List::getFunctions())->{'down'}($client);
+
+		} elsif (mode($client) ne 'search') {
 			Slim::Buttons::Home::jumpToMenu($client,"SEARCH");
 			$client->update();
 		}
@@ -529,9 +533,15 @@
 		my $buttonarg = shift;
 		my $playdisp = undef;
 
-		setMode($client, 'home');
-		Slim::Buttons::Home::jumpToMenu($client,"BROWSE_MUSIC");
-		$client->update();
+		# Repeat presses of 'browse' will step through browse menu
+		if ($client->curDepth eq '-BROWSE_MUSIC' && mode($client) eq 'INPUT.List') {
+			(Slim::Buttons::Input::List::getFunctions())->{'down'}($client);
+
+		} else {
+			setMode($client, 'home');
+			Slim::Buttons::Home::jumpToMenu($client,"BROWSE_MUSIC");
+			$client->update();
+		}
 	},
 
 	'favorites' => sub  {