diff --git a/src/d_main.cpp b/src/d_main.cpp
index 29a12c9c29..2570e7a36d 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -1987,8 +1987,6 @@ static void D_DoomInit()
 	Args->CollectFiles("-playdemo", ".lmp");
 	Args->CollectFiles("-file", NULL);	// anything left goes after -file
 
-	atterm (C_DeinitConsole);
-
 	gamestate = GS_STARTUP;
 
 	SetLanguageIDs ();
diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp
index 88850d9fe1..9b3027a7d8 100644
--- a/src/sdl/i_system.cpp
+++ b/src/sdl/i_system.cpp
@@ -353,6 +353,8 @@ void I_Quit (void)
 
     if (demorecording)
 		G_CheckDemoStatus();
+
+	C_DeinitConsole();
 }
 
 
diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp
index 4690c253d6..4248df2740 100644
--- a/src/win32/i_system.cpp
+++ b/src/win32/i_system.cpp
@@ -781,6 +781,8 @@ void I_Quit()
 	{
 		G_CheckDemoStatus();
 	}
+
+	C_DeinitConsole();
 }