diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index aa8481629..d15c01086 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -1055,19 +1055,17 @@ void SaveManager::SaveFileThreaded(int fileNum, SaveContext* saveContext, int se
     output.close();
 #endif
 
+#if defined(__SWITCH__) || defined(__WIIU__)
     if (std::filesystem::exists(fileName)) {
         std::filesystem::remove(fileName);
     }
-
-#if defined(__SWITCH__) || defined(__WIIU__)
     copy_file(tempFile.c_str(), fileName.c_str());
-#else
-    std::filesystem::copy_file(tempFile, fileName);
-#endif
-
     if (std::filesystem::exists(tempFile)) {
         std::filesystem::remove(tempFile);
     }
+#else
+    std::filesystem::rename(tempFile, fileName);
+#endif
 
     delete saveContext;
     InitMeta(fileNum);
@@ -1164,15 +1162,12 @@ void SaveManager::LoadFile(int fileNum) {
                             std::string newFileName = Ship::Context::GetPathRelativeToAppDirectory("Save") +
                                                       ("/file" + std::to_string(fileNum + 1) + "-" +
                                                        std::to_string(GetUnixTimestamp()) + ".bak");
-                            std::filesystem::path newFile(newFileName);
-
 #if defined(__SWITCH__) || defined(__WIIU__)
-                            copy_file(fileName.c_str(), newFile.c_str());
-#else
-                            std::filesystem::copy_file(fileName, newFile);
-#endif
-
+                            copy_file(fileName.c_str(), newFileName.c_str());
                             std::filesystem::remove(fileName);
+#else
+                            std::filesystem::rename(fileName, newFileName);
+#endif
                             SohGui::RegisterPopup(
                                 "Outdated Randomizer Save",
                                 "The SoH version in the file in slot " + std::to_string(fileNum + 1) +
@@ -1229,16 +1224,15 @@ void SaveManager::LoadFile(int fileNum) {
         GameInteractor::Instance->ExecuteHooks<GameInteractor::OnLoadFile>(fileNum);
     } catch (const std::exception& e) {
         input.close();
-        std::filesystem::path newFile(
+        std::string newFileName =
             Ship::Context::GetPathRelativeToAppDirectory("Save") +
-            ("/file" + std::to_string(fileNum + 1) + "-" + std::to_string(GetUnixTimestamp()) + ".bak"));
+            ("/file" + std::to_string(fileNum + 1) + "-" + std::to_string(GetUnixTimestamp()) + ".bak");
 #if defined(__SWITCH__) || defined(__WIIU__)
-        copy_file(fileName.c_str(), newFile.c_str());
-#else
-        std::filesystem::copy_file(fileName, newFile);
-#endif
-
+        copy_file(fileName.c_str(), newFileName.c_str());
         std::filesystem::remove(fileName);
+#else
+        std::filesystem::rename(fileName, newFileName);
+#endif
         SohGui::RegisterPopup("Error loading save file", "A problem occurred loading the save in slot " +
                                                              std::to_string(fileNum + 1) +
                                                              ".\nSave file corruption is suspected.\n" +