diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp
index 0761f6e76f..897d3d099b 100644
--- a/src/apps/drivesetup/MainWindow.cpp
+++ b/src/apps/drivesetup/MainWindow.cpp
@@ -633,7 +633,8 @@ MainWindow::_Unmount(BDiskDevice* disk, partition_id selectedPartition)
 			_DisplayPartitionError("Could not unmount partition %s.",
 				partition, ret);
 		} else {
-			rmdir(path.Path());
+			if (dev_for_path(path.Path()) == dev_for_path("/"))
+				rmdir(path.Path());
 			// successful unmount, adapt to the changes
 			_ScanDrives();
 		}