diff --git a/src/Main/Forms/VolumeSizeWizardPage.cpp b/src/Main/Forms/VolumeSizeWizardPage.cpp
index 61427ea5..ce337620 100644
--- a/src/Main/Forms/VolumeSizeWizardPage.cpp
+++ b/src/Main/Forms/VolumeSizeWizardPage.cpp
@@ -79,7 +79,7 @@ namespace VeraCrypt
 		uint64 val;
 		if (UseAllFreeSpaceCheckBox->IsChecked ())
 		{
-			val = AvailableDiskSpace;
+			val = MaxVolumeSizeValid ? MaxVolumeSize : AvailableDiskSpace;
 		}
 		else
 		{