diff --git a/src/apps/drivesetup/Jamfile b/src/apps/drivesetup/Jamfile
index bd85b21ee7..0eba2d5d2e 100644
--- a/src/apps/drivesetup/Jamfile
+++ b/src/apps/drivesetup/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src apps drivesetup ;
 
 AddSubDirSupportedPlatforms libbe_test ;
 
-UsePrivateHeaders interface shared storage ;
+UsePrivateHeaders interface shared storage tracker ;
 
 Preference DriveSetup :
 	DiskView.cpp
diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp
index 41dab3d7e1..7082860331 100644
--- a/src/apps/drivesetup/MainWindow.cpp
+++ b/src/apps/drivesetup/MainWindow.cpp
@@ -13,6 +13,7 @@
 #include "InitParamsPanel.h"
 #include "PartitionList.h"
 #include "Support.h"
+#include "tracker_private.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -233,6 +234,9 @@ MainWindow::MainWindow(BRect frame)
 
 	// visit all disks in the system and show their contents
 	_ScanDrives();
+
+	if (!be_roster->IsRunning(kDeskbarSignature))
+		SetFlags(Flags() | B_NOT_MINIMIZABLE)
 }