diff --git a/nq/source/cl_demo.c b/nq/source/cl_demo.c
index cecbe3762..4f4a6aed0 100644
--- a/nq/source/cl_demo.c
+++ b/nq/source/cl_demo.c
@@ -46,6 +46,7 @@
 #include "QF/sys.h"
 #include "QF/console.h"
 #include "QF/cmd.h"
+#include "QF/keys.h"
 
 void        CL_FinishTimeDemo (void);
 
@@ -307,6 +308,7 @@ CL_PlayDemo_f (void)
 	cls.demoplayback = true;
 	cls.state = ca_connected;
 	cls.forcetrack = 0;
+	key_dest = key_game;
 
 	while ((c = Qgetc (cls.demofile)) != '\n')
 		if (c == '-')
diff --git a/nq/source/cl_main.c b/nq/source/cl_main.c
index 74a4556e6..9b1b6172e 100644
--- a/nq/source/cl_main.c
+++ b/nq/source/cl_main.c
@@ -36,6 +36,7 @@
 #include "QF/console.h"
 #include "QF/cvar.h"
 #include "QF/input.h"
+#include "QF/keys.h"
 #include "QF/msg.h"
 #include "QF/screen.h"
 #include "QF/va.h"
@@ -278,6 +279,7 @@ CL_EstablishConnection (char *host)
 	cls.state = ca_connected;
 	cls.signon = 0;						// need all the signon messages
 										// before playing
+	key_dest = key_game;
 }
 
 
diff --git a/nq/source/gl_screen.c b/nq/source/gl_screen.c
index df4e9bcd2..f61dd005c 100644
--- a/nq/source/gl_screen.c
+++ b/nq/source/gl_screen.c
@@ -537,6 +537,7 @@ SCR_SetUpToDrawConsole (void)
 	if (cls.state != ca_active) {
 		scr_conlines = vid.height;		// full screen
 		scr_con_current = scr_conlines;
+		key_dest = key_console;
 	} else if (key_dest == key_console)
 		scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
 	else
diff --git a/nq/source/screen.c b/nq/source/screen.c
index b405d1404..3322a0349 100644
--- a/nq/source/screen.c
+++ b/nq/source/screen.c
@@ -563,6 +563,7 @@ SCR_SetUpToDrawConsole (void)
 	if (cls.state != ca_active) {
 		scr_conlines = vid.height;		// full screen
 		scr_con_current = scr_conlines;
+		key_dest = key_console;
 	} else if (key_dest == key_console)
 		scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
 	else
diff --git a/qw/source/cl_pred.c b/qw/source/cl_pred.c
index 7d079debb..5b27fe9a0 100644
--- a/qw/source/cl_pred.c
+++ b/qw/source/cl_pred.c
@@ -32,11 +32,13 @@
 
 #include <math.h>
 
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/keys.h"
+
 #include "bothdefs.h"
 #include "cl_ents.h"
 #include "client.h"
-#include "QF/console.h"
-#include "QF/cvar.h"
 #include "pmove.h"
 
 cvar_t     *cl_nopred;
@@ -140,6 +142,7 @@ CL_PredictMove (void)
 										// stage
 		VID_SetCaption (cls.servername);
 		cls.state = ca_active;
+		key_dest = key_game;
 	}
 
 	if (cl_nopred->int_val) {
diff --git a/qw/source/gl_screen.c b/qw/source/gl_screen.c
index 2f20152a5..4f04ce15d 100644
--- a/qw/source/gl_screen.c
+++ b/qw/source/gl_screen.c
@@ -537,6 +537,7 @@ SCR_SetUpToDrawConsole (void)
 	if (cls.state != ca_active) {
 		scr_conlines = vid.height;		// full screen
 		scr_con_current = scr_conlines;
+		key_dest = key_console;
 	} else if (key_dest == key_console)
 		scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
 	else
diff --git a/qw/source/screen.c b/qw/source/screen.c
index 306df83b8..112f5cb2c 100644
--- a/qw/source/screen.c
+++ b/qw/source/screen.c
@@ -562,6 +562,7 @@ SCR_SetUpToDrawConsole (void)
 	if (cls.state != ca_active) {
 		scr_conlines = vid.height;		// full screen
 		scr_con_current = scr_conlines;
+		key_dest = key_console;
 	} else if (key_dest == key_console)
 		scr_conlines = vid.height * bound (0.2, scr_consize->value, 1);
 	else