diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 3e550f20..9b05deaa 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -3567,6 +3567,8 @@ void CL_Shutdown(const char* finalmsg, qboolean disconnect, qboolean quit) {
 	Cmd_RemoveCommand ("video");
 	Cmd_RemoveCommand ("stopvideo");
 
+	CL_ShutdownInput();
+
 	Cvar_Set( "cl_running", "0" );
 
 	recursive = qfalse;
diff --git a/code/client/client.h b/code/client/client.h
index 6fe6eed4..c739d4fb 100644
--- a/code/client/client.h
+++ b/code/client/client.h
@@ -520,6 +520,7 @@ void IN_MouseOn( void );
 void IN_MouseOff( void );
 
 void CL_InitInput (void);
+void CL_ShutdownInput(void);
 void CL_SendCmd (void);
 void CL_ClearState (void);
 void CL_ReadPackets (void);
@@ -583,6 +584,7 @@ void Con_DrawCharacter (int cx, int line, int num);
 
 void Con_CheckResize (void);
 void Con_Init (void);
+void Con_Shutdown (void);
 void Con_Clear_f (void);
 void Con_ToggleConsole_f (void);
 void Con_DrawNotify (void);