diff --git a/reactos/lib/fslib/vfatlib/fat12.c b/reactos/lib/fslib/vfatlib/fat12.c
index fc701cf4c3e..b9f8bad46f2 100644
--- a/reactos/lib/fslib/vfatlib/fat12.c
+++ b/reactos/lib/fslib/vfatlib/fat12.c
@@ -323,7 +323,7 @@ Fat12Format(IN HANDLE FileHandle,
     BootSector.Heads = DiskGeometry->TracksPerCylinder;
     BootSector.HiddenSectors = PartitionInfo->HiddenSectors;
     BootSector.SectorsHuge = (SectorCount >= 0x10000) ? (unsigned long)SectorCount : 0;
-    BootSector.Drive = 0xff; /* No BIOS boot drive available */
+    BootSector.Drive = DiskGeometry->MediaType == FixedMedia ? 0x80 : 0x00;
     BootSector.ExtBootSignature = 0x29;
     BootSector.VolumeID = CalcVolumeSerialNumber();
     if ((Label == NULL) || (Label->Buffer == NULL))
diff --git a/reactos/lib/fslib/vfatlib/fat16.c b/reactos/lib/fslib/vfatlib/fat16.c
index 221ad81d501..8cd7551d938 100644
--- a/reactos/lib/fslib/vfatlib/fat16.c
+++ b/reactos/lib/fslib/vfatlib/fat16.c
@@ -330,7 +330,7 @@ Fat16Format(IN HANDLE FileHandle,
     BootSector.Heads = DiskGeometry->TracksPerCylinder;
     BootSector.HiddenSectors = PartitionInfo->HiddenSectors;
     BootSector.SectorsHuge = (SectorCount >= 0x10000) ? (unsigned long)SectorCount : 0;
-    BootSector.Drive = 0xff; /* No BIOS boot drive available */
+    BootSector.Drive = DiskGeometry->MediaType == FixedMedia ? 0x80 : 0x00;
     BootSector.ExtBootSignature = 0x29;
     BootSector.VolumeID = CalcVolumeSerialNumber();
     if ((Label == NULL) || (Label->Buffer == NULL))
diff --git a/reactos/lib/fslib/vfatlib/fat32.c b/reactos/lib/fslib/vfatlib/fat32.c
index 1b5e4983a1b..0137fabe70c 100644
--- a/reactos/lib/fslib/vfatlib/fat32.c
+++ b/reactos/lib/fslib/vfatlib/fat32.c
@@ -408,7 +408,7 @@ Fat32Format(IN HANDLE FileHandle,
     BootSector.RootCluster = 2;
     BootSector.FSInfoSector = 1;
     BootSector.BootBackup = 6;
-    BootSector.Drive = 0xff; /* No BIOS boot drive available */
+    BootSector.Drive = DiskGeometry->MediaType == FixedMedia ? 0x80 : 0x00;
     BootSector.ExtBootSignature = 0x29;
     BootSector.VolumeID = CalcVolumeSerialNumber ();
     if ((Label == NULL) || (Label->Buffer == NULL))