diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index 5d674fe103..e0c2abc8e0 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -9258,8 +9258,9 @@ BPoseView::ShouldIntegrateDesktop(const BVolume &volume)
 	if (!settings.IntegrateNonBootBeOSDesktops())
 		return false;
 
-	// That's obviously what makes a BeOS desktop :-)
-	return volume.KnowsQuery() && volume.KnowsAttr() && volume.KnowsMime();
+	// Only removable read-only volumes should have their desktops integrated
+	return volume.IsRemovable() && volume.IsReadOnly()
+		&& volume.KnowsQuery() && volume.KnowsAttr() && volume.KnowsMime();
 }
 
 
diff --git a/src/kits/tracker/TrackerSettings.cpp b/src/kits/tracker/TrackerSettings.cpp
index 67fecae52a..a77fd8e013 100644
--- a/src/kits/tracker/TrackerSettings.cpp
+++ b/src/kits/tracker/TrackerSettings.cpp
@@ -172,7 +172,7 @@ TTrackerState::LoadSettingsIfNeeded()
 	Add(fMountSharedVolumesOntoDesktop =
 		new BooleanValueSetting("MountSharedVolumesOntoDesktop", false));
 	Add(fIntegrateNonBootBeOSDesktops = new BooleanValueSetting
-		("IntegrateNonBootBeOSDesktops", false));
+		("IntegrateNonBootBeOSDesktops", true));
 	Add(fIntegrateAllNonBootDesktops = new BooleanValueSetting
 		("IntegrateAllNonBootDesktops", false));
 	Add(fEjectWhenUnmounting = new BooleanValueSetting("EjectWhenUnmounting", true));