diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp
index f2a0361cf2..80b9748cfe 100644
--- a/src/d/d_file_select.cpp
+++ b/src/d/d_file_select.cpp
@@ -1535,7 +1535,12 @@ void dFile_select_c::nameInput2() {
     case 2:
         dComIfGs_setHorseName(mpName->getInputStrPtr());
         mIsSelectEnd = true;
-        dComIfGs_setupRandomizerSave();
+#if TARGET_PC
+        // Create a randomizer save if Z is being held
+        if (mDoCPd_c::getHoldZ(PAD_1)) {
+            dComIfGs_setupRandomizerSave();
+        }
+#endif
         mDataSelProc = DATASELPROC_NEXT_MODE_WAIT;
     }
 }