diff --git a/Projects/Src/Setup.NewDiskForm.pas b/Projects/Src/Setup.NewDiskForm.pas
index eac2348a..31febcd3 100644
--- a/Projects/Src/Setup.NewDiskForm.pas
+++ b/Projects/Src/Setup.NewDiskForm.pas
@@ -58,6 +58,7 @@ function SelectDisk(const DiskNumber: Integer; const AFilename: String;
       Filename := AFilename;
       SelectDiskLabel.Caption := FmtSetupMessage(msgSelectDiskLabel2, [IntToStr(DiskNumber)]);
       PathEdit.Text := Path;
+      ActiveControl := OKButton;
       Result := ShowModal = mrOK;
       if Result then
         Path := GetSanitizedPath;