diff --git a/stepmania/src/archutils/Win32/Crash.cpp b/stepmania/src/archutils/Win32/Crash.cpp
index da05a25b65..b8e333cec5 100644
--- a/stepmania/src/archutils/Win32/Crash.cpp
+++ b/stepmania/src/archutils/Win32/Crash.cpp
@@ -31,6 +31,8 @@
 
 #include "RageLog.h" /* for RageLog::GetAdditionalLog and Flush */
 #include "RageThreads.h" /* for GetCheckpointLogs */
+#include "PrefsManager.h" /* for g_bAutoRestart */
+#include "RestartProgram.h"
 
 #include "GotoURL.h"
 
@@ -209,6 +211,9 @@ long __stdcall CrashHandler(EXCEPTION_POINTERS *pExc)
 	 * dump, save it now. */
 	DoSave(pExc);
 
+	if( g_bAutoRestart )
+		Win32RestartProgram();
+
 	/* Little trick to get an HINSTANCE of ourself without having access to the hwnd ... */
 	{
 		TCHAR szFullAppPath[MAX_PATH];