--- Slim/Buttons/Home.pm	2005-05-04 07:23:00.000000000 -0700
+++ server/Slim/Buttons/Home.pm	2005-05-04 11:48:41.359375000 -0700
@@ -300,10 +300,13 @@ sub getMenu {
 	my $current = \%home;
 	return $current if $depth eq "";
 	my @depth = split(/-/,$depth);
+	
 	#home reference is "" so drop first item
 	shift @depth;
+	
 	#top level reference
 	$current = $current->{shift @depth};
+	
 	# recursive submenus
 	for my $level (@depth) {
 		$current = $current->{'submenus'}->{$level};
@@ -317,6 +322,9 @@ sub homeExitHandler {
 	if ($exittype eq 'LEFT') {
 		if ($client->curDepth() ne "") {
 			$client->curDepth(getLastDepth($client));
+			
+			# call jump in case top level has changed.
+			jump($client,$client->curSelection($client->curDepth()));
 			Slim::Buttons::Common::popModeRight($client);
 		} else {
 			# We've hit the home root
@@ -426,14 +434,14 @@ sub createList {
 sub jump {
 	my $client = shift;
 	my $item = shift;
-	my $depth = shift;
 	
-	$depth = "" unless defined $depth;
+	# force top level
+	$client->curDepth("");
+	$client->curSelection($client->curDepth(),undef);
+	
 	for my $menuitem (@{$homeChoices{$client}}) {
-		
 		next unless $menuitem eq $item;
 		
-		$client->curDepth($depth);
 		$client->curSelection($client->curDepth(),$item);
 	}