2 files changed, 3 insertions, 4 deletions
diff --git a/TODO b/TODO
index 425f0a4..34f3371 100644
--- a/TODO
+++ b/TODO
@@ -17,8 +17,6 @@ X Configurable ctcp version response. Not going to do for now. Having
 
 Other stuff:
 
-- [*] BUG: after start+number, start+a, start+tab, the first keystroke
-  gets ignored. Does not happen with esc or ctrl-numbers.
 - [*] Start+A should *always* switch windows, even if all are inactive.
   It can act like Start+Left in that case.
 - [*] Auto-pinging the server seems to work, but needs more testing.
diff --git a/src/irc.c b/src/irc.c
index bd1e479..b8237d2 100644
--- a/src/irc.c
+++ b/src/irc.c
@@ -1041,10 +1041,11 @@ void start_keystroke(char c) {
 static void poll_keyboard(void) {
 	char c;
 
-	if(GTIA_READ.consol == 6) start_latch = 1;
-
 	if(!keypress()) return;
 
+	/* have to latch start status because doing a keyclick clears CONSOL */
+	if(GTIA_READ.consol == 6) start_latch = 1;
+
 	c = kgetc();
 	if(!c) return;