Index: IR/Default.map
===================================================================
--- IR/Default.map	(revision 8675)
+++ IR/Default.map	(working copy)
@@ -100,7 +100,7 @@
 
 # special buttons
 browse					= browse
-search					= search
+search					= browse
 favorites.single		= favorites
 favorites.hold			= favorites_add
 visual					= visual_toggle
Index: Slim/Buttons/Common.pm
===================================================================
--- Slim/Buttons/Common.pm	(revision 8675)
+++ Slim/Buttons/Common.pm	(working copy)
@@ -449,7 +449,8 @@
 		my $buttonarg = shift;
 		my $playdisp = undef;
 		
-		setMode($client, 'home');
+		#setMode($client, 'home');
+		while (popMode($client)) {};
 		Slim::Buttons::Home::jumpToMenu($client,"BROWSE_MUSIC");
 		$client->update();
 	},