diff --git a/Changes b/Changes
index 50ff7eb1f..f9a26d4c9 100644
--- a/Changes
+++ b/Changes
@@ -1661,3 +1661,5 @@ seen. gmtime warning still there
   can make sure all servers report the same global max and that a local max can be adjusted
   if for example a clone flood occurs. It is NOT designed to make the max count higher than
   you actually have.
+- Fixed a bug in the win32 debugger where the contents of the core file were not written
+  until ok was clicked. Reported by Simon Bell.
diff --git a/src/win32/debug.c b/src/win32/debug.c
index 0b2fa03fa..928ad2e91 100644
--- a/src/win32/debug.c
+++ b/src/win32/debug.c
@@ -198,6 +198,7 @@ LONG __stdcall ExceptionFilter(EXCEPTION_POINTERS *e) {
 	sprintf(text, "UnrealIRCd has encountered a fatal error. Debugging information has"
 		" been dumped to wircd.%d.core, please email this file to coders@lists.unrealircd.org.",
 		getpid());
+	fclose(fd);
 	if (!IsService)
 		MessageBox(NULL, text, "Fatal Error", MB_OK);
 	else {
@@ -207,7 +208,6 @@ LONG __stdcall ExceptionFilter(EXCEPTION_POINTERS *e) {
 		fclose(fd);
 	}
 	CleanUp();
-	fclose(fd);
 	return EXCEPTION_EXECUTE_HANDLER;
 }