diff --git a/src/kits/tracker/SettingsViews.cpp b/src/kits/tracker/SettingsViews.cpp
index 418d083830..1f4a730c30 100644
--- a/src/kits/tracker/SettingsViews.cpp
+++ b/src/kits/tracker/SettingsViews.cpp
@@ -308,7 +308,7 @@ DesktopSettingsView::SetDefaults()
 
 	settings.SetShowDisksIcon(false);
 	settings.SetMountVolumesOntoDesktop(true);
-	settings.SetMountSharedVolumesOntoDesktop(false);
+	settings.SetMountSharedVolumesOntoDesktop(true);
 	settings.SetIntegrateNonBootBeOSDesktops(false);
 	settings.SetEjectWhenUnmounting(true);
 
diff --git a/src/kits/tracker/TrackerInitialState.cpp b/src/kits/tracker/TrackerInitialState.cpp
index 0aa93b69d3..2c84e6c358 100644
--- a/src/kits/tracker/TrackerInitialState.cpp
+++ b/src/kits/tracker/TrackerInitialState.cpp
@@ -472,7 +472,6 @@ TTracker::InstallTemporaryBackgroundImages()
 	if (FSGetBootDeskDir(&dir) == B_OK) {
 		attr_info info;
 		if (dir.GetAttrInfo(kBackgroundImageInfo, &info) != B_OK) {
-
 			BMessage message;
 			AddTemporaryBackgroundImages(&message,
 				(BString(defaultFolderPath) << "bgdefault.tga").String(),
diff --git a/src/kits/tracker/TrackerSettings.cpp b/src/kits/tracker/TrackerSettings.cpp
index 5179a5b0f3..c6635a6839 100644
--- a/src/kits/tracker/TrackerSettings.cpp
+++ b/src/kits/tracker/TrackerSettings.cpp
@@ -167,10 +167,12 @@ TTrackerState::LoadSettingsIfNeeded()
 	if (fSettingsLoaded)
 		return;
 
+	// Set default settings before reading from disk
+
 	Add(fShowDisksIcon = new BooleanValueSetting("ShowDisksIcon", false));
 	Add(fMountVolumesOntoDesktop = new BooleanValueSetting("MountVolumesOntoDesktop", true));
 	Add(fMountSharedVolumesOntoDesktop =
-		new BooleanValueSetting("MountSharedVolumesOntoDesktop", false));
+		new BooleanValueSetting("MountSharedVolumesOntoDesktop", true));
 	Add(fIntegrateNonBootBeOSDesktops = new BooleanValueSetting
 		("IntegrateNonBootBeOSDesktops", true));
 	Add(fIntegrateAllNonBootDesktops = new BooleanValueSetting