diff --git a/src/Cxbx/WinMain.cpp b/src/Cxbx/WinMain.cpp
index e86ab8aae..b27567206 100644
--- a/src/Cxbx/WinMain.cpp
+++ b/src/Cxbx/WinMain.cpp
@@ -59,6 +59,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 		return 1;
 	}
 
+	/* Initialize Cxbx File Paths */
+	CxbxInitFilePaths();
+
     /*! initialize shared memory */
     EmuShared::Init();
 
diff --git a/src/CxbxKrnl/CxbxKrnl.cpp b/src/CxbxKrnl/CxbxKrnl.cpp
index 3465cf069..be368b66c 100644
--- a/src/CxbxKrnl/CxbxKrnl.cpp
+++ b/src/CxbxKrnl/CxbxKrnl.cpp
@@ -396,8 +396,6 @@ void CxbxKrnlMain(int argc, char* argv[])
 		RestoreExeImageHeader();
 	}
 
-	CxbxInitFilePaths();
-
 	CxbxRestoreContiguousMemory(szFilePath_memory_bin);
 
 	CxbxRestorePersistentMemoryRegions();
@@ -801,7 +799,7 @@ void CxbxInitFilePaths()
 	// Make sure our data folder exists :
 	int result = SHCreateDirectoryEx(nullptr, szFolder_CxbxReloadedData, nullptr);
 	if ((result != ERROR_SUCCESS) && (result != ERROR_ALREADY_EXISTS))
-		CxbxKrnlCleanup("CxbxInitFilePaths : Couldn't create Cxbx-Reloaded AppData folder!");

+		CxbxKrnlCleanup("CxbxInitFilePaths : Couldn't create Cxbx-Reloaded AppData folder!");
 
 	snprintf(szFilePath_LaunchDataPage_bin, MAX_PATH, "%s\\CxbxLaunchDataPage.bin", szFolder_CxbxReloadedData);
 	snprintf(szFilePath_EEPROM_bin, MAX_PATH, "%s\\EEPROM.bin", szFolder_CxbxReloadedData);