diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 2f7183785..31ba7c94f 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,6 @@
 June 9, 2009  (Changes by Graf Zahl)
+- Fixed: I_ShutdownInput must NULL all pointers because it can be called twice
+  if an ENDOOM screen is displayed.
 - Fixed: R_DrawSkyStriped used frontyScale without initializing it first.
 - Fixed: P_LineAttack may not check the puff actor for MF6_FORCEPAIN because
   it's not necessarily spawned yet. 
diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp
index f23248f12..cc345bbce 100644
--- a/src/win32/i_input.cpp
+++ b/src/win32/i_input.cpp
@@ -1184,10 +1184,12 @@ void I_ShutdownInput ()
 	if (Keyboard != NULL)
 	{
 		delete Keyboard;
+		Keyboard = NULL;
 	}
 	if (Mouse != NULL)
 	{
 		delete Mouse;
+		Mouse = NULL;
 	}
 	if (g_pJoy)
 	{