diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 859e649c98..b1ef25d003 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -1674,6 +1674,14 @@ BContainerWindow::MessageReceived(BMessage* message)
 							SetPathWatchingEnabled(settings.ShowNavigator()
 								|| settings.ShowFullPathInTitleBar());
 						}
+
+						if (!settings.SingleWindowBrowse()
+							&& dynamic_cast<BDeskWindow*>(this) == NULL
+							&& TargetModel()->IsDesktop()) {
+							// close the "Desktop" window, but not the Desktop
+							this->Quit();
+						}
+
 						SetSingleWindowBrowseShortcuts(
 							settings.SingleWindowBrowse());
 						break;