diff --git a/CHANGES b/CHANGES
index a113e7038..54e8dcaae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ Other fixes:
  - FFmpeg: Fix failing to record videos with CRF video (fixes mgba.io/i/3368)
  - GBA Core: Fix booting into BIOS when skip BIOS is enabled
  - GBA Hardware: Fix loading states unconditionally overwriting GPIO memory
+ - Updater: Fix rewriting folders and files on Windows (fixes mgba.io/i/3384)
 
 0.10.4: (2024-12-07)
 Emulation fixes:
diff --git a/src/feature/updater-main.c b/src/feature/updater-main.c
index a27a07a08..b536e3208 100644
--- a/src/feature/updater-main.c
+++ b/src/feature/updater-main.c
@@ -133,14 +133,11 @@ bool extractArchive(struct VDir* archive, const char* root, bool prefix) {
 			errno = 0;
 			vfOut = VFileOpen(path, O_WRONLY | O_CREAT | O_TRUNC);
 			if (!vfOut) {
-				if (errno == EACCES) {
-#ifdef _WIN32
-					Sleep(1000);
-#else
-					sleep(1);
-#endif
-					vfOut = VFileOpen(path, O_WRONLY | O_CREAT | O_TRUNC);
-				} else if (errno == EISDIR) {
+				int error = errno;
+				struct stat st;
+				if (error == EISDIR || (stat(path, &st) >= 0 && S_ISDIR(st.st_mode))) {
+					// Windows maps STATUS_FILE_IS_A_DIRECTORY to ERROR_ACCESS_DENIED,
+					// which then gets mapped to EACCESS, because everything is awful
 					fprintf(logfile, "rm -r   %s\n", path);
 					if (!rmdirRecursive(VDirOpen(path))) {
 						return false;
@@ -151,6 +148,13 @@ bool extractArchive(struct VDir* archive, const char* root, bool prefix) {
 					RemoveDirectoryW(wpath);
 #else
 					rmdir(path);
+#endif
+					vfOut = VFileOpen(path, O_WRONLY | O_CREAT | O_TRUNC);
+				} else if (error == EACCES || error == ETXTBSY) {
+#ifdef _WIN32
+					Sleep(1000);
+#else
+					sleep(1);
 #endif
 					vfOut = VFileOpen(path, O_WRONLY | O_CREAT | O_TRUNC);
 				}