diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 294bca4472..73edc42041 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -4056,6 +4056,8 @@ BContainerWindow::SetSingleWindowBrowseShortcuts(bool enabled)
 			new BMessage(kNavigatorCommandUp), Navigator());
 		AddShortcut(B_DOWN_ARROW, B_OPTION_KEY | B_COMMAND_KEY,
 			new BMessage(kOpenSelection), PoseView());
+		AddShortcut('L', B_COMMAND_KEY,
+			new BMessage(kNavigatorCommandSetFocus), Navigator());
 
 	} else {
 		RemoveShortcut(B_LEFT_ARROW, B_COMMAND_KEY);
@@ -4078,6 +4080,7 @@ BContainerWindow::SetSingleWindowBrowseShortcuts(bool enabled)
 		AddShortcut(B_UP_ARROW, B_COMMAND_KEY | B_OPTION_KEY,
 			new BMessage(kOpenParentDir), PoseView());
 			// command + option results in closing the parent window
+		RemoveShortcut('L', B_COMMAND_KEY);
 	}
 }
 
diff --git a/src/kits/tracker/Navigator.cpp b/src/kits/tracker/Navigator.cpp
index 3d0ef5cbdf..c6c3689481 100644
--- a/src/kits/tracker/Navigator.cpp
+++ b/src/kits/tracker/Navigator.cpp
@@ -234,6 +234,10 @@ BNavigator::MessageReceived(BMessage* message)
 			GoTo();
 			break;
 
+		case kNavigatorCommandSetFocus:
+			fLocation->MakeFocus();
+			break;
+
 		default:
 		{
 			// Catch any dropped refs and try to switch to this new directory
diff --git a/src/kits/tracker/Navigator.h b/src/kits/tracker/Navigator.h
index d290a2f8d8..7f731113c9 100644
--- a/src/kits/tracker/Navigator.h
+++ b/src/kits/tracker/Navigator.h
@@ -58,7 +58,8 @@ enum NavigationAction
 	kNavigatorCommandBackward = 'NVBW',
 	kNavigatorCommandForward = 'NVFW',
 	kNavigatorCommandUp = 'NVUP',
-	kNavigatorCommandLocation = 'NVLC'
+	kNavigatorCommandLocation = 'NVLC',
+	kNavigatorCommandSetFocus = 'NVSF'
 };