diff --git a/reactos/base/setup/usetup/partlist.c b/reactos/base/setup/usetup/partlist.c
index c78597e9cd1..18289a518fc 100644
--- a/reactos/base/setup/usetup/partlist.c
+++ b/reactos/base/setup/usetup/partlist.c
@@ -836,18 +836,15 @@ AddDiskToList (HANDLE FileHandle,
   DPRINT ("SectorsPerTrack %d\n", DiskEntry->SectorsPerTrack);
   DPRINT ("BytesPerSector %d\n", DiskEntry->BytesPerSector);
 
-  DiskEntry->DiskSize =
-    DiskGeometry.Cylinders.QuadPart *
-    (ULONGLONG)DiskGeometry.TracksPerCylinder *
+  DiskEntry->TrackSize =
     (ULONGLONG)DiskGeometry.SectorsPerTrack *
     (ULONGLONG)DiskGeometry.BytesPerSector;
   DiskEntry->CylinderSize =
     (ULONGLONG)DiskGeometry.TracksPerCylinder *
-    (ULONGLONG)DiskGeometry.SectorsPerTrack *
-    (ULONGLONG)DiskGeometry.BytesPerSector;
-  DiskEntry->TrackSize =
-    (ULONGLONG)DiskGeometry.SectorsPerTrack *
-    (ULONGLONG)DiskGeometry.BytesPerSector;
+    DiskEntry->TrackSize;
+  DiskEntry->DiskSize =
+    DiskGeometry.Cylinders.QuadPart *
+    DiskEntry->CylinderSize;
 
   DiskEntry->DiskNumber = DiskNumber;
   DiskEntry->Port = ScsiAddress.PortNumber;