diff --git a/src/getchar.c b/src/getchar.c
index 55fdd31..9c1ab0f 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2731,6 +2731,11 @@
 		}
 		if (c < 0)
 		    continue;	/* end of input script reached */
+
+		/* Allow mapping for just typed characters. When we get here c
+		 * is the number of extra bytes and typebuf.tb_len is 1. */
+		for (n = 1; n <= c; ++n)
+		    typebuf.tb_noremap[typebuf.tb_off + n] = RM_YES;
 		typebuf.tb_len += c;
 
 		/* buffer full, don't map */