diff --git a/vt100.key.S b/vt100.key.S
index 409064c..f3f9f81 100644
--- a/vt100.key.S
+++ b/vt100.key.S
@@ -59,6 +59,7 @@ keypress ent
 
 :ctrl
 	lda key
+	and #$1f ; control-space should generate 0, not $20.
 	bra :send
 
 :notctrl
@@ -199,6 +200,7 @@ digit
 	lda #'?'
 	jsr dispatch
 	lda key
+	ora #$40
 	jmp dispatch