diff --git a/src/ex_getln.c b/src/ex_getln.c
index afdf0b4..894756d 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -54,6 +54,8 @@
 
 static int	extra_char = NUL;  /* extra character to display when redrawing
 				    * the command line */
+static int	extra_char_shift;
+
 #ifdef FEAT_CMDHIST
 typedef struct hist_entry
 {
@@ -1175,7 +1177,6 @@
 		dont_scroll = TRUE;	/* disallow scrolling here */
 #endif
 		putcmdline('"', TRUE);
-		extra_char = '"';
 		++no_mapping;
 		i = c = plain_vgetc();	/* CTRL-R <char> */
 		if (i == Ctrl_O)
@@ -1759,7 +1760,6 @@
 		ignore_drag_release = TRUE;
 #endif
 		putcmdline('^', TRUE);
-		extra_char = '^';
 		c = get_literal();	    /* get next (two) character(s) */
 		do_abbr = FALSE;	    /* don't do abbreviation now */
 		extra_char = NUL;
@@ -1780,7 +1780,6 @@
 		ignore_drag_release = TRUE;
 #endif
 		putcmdline('?', TRUE);
-		extra_char = '?';
 #ifdef USE_ON_FLY_SCROLL
 		dont_scroll = TRUE;	    /* disallow scrolling here */
 #endif
@@ -2945,6 +2944,8 @@
 	draw_cmdline(ccline.cmdpos, ccline.cmdlen - ccline.cmdpos);
     msg_no_more = FALSE;
     cursorcmd();
+    extra_char = c;
+    extra_char_shift = shift;
 }
 
 /*
@@ -2967,6 +2968,7 @@
 	draw_cmdline(ccline.cmdpos, 1);
     msg_no_more = FALSE;
     cursorcmd();
+    extra_char = NUL;
 }
 
 /*
@@ -3418,7 +3420,7 @@
 
     set_cmdspos_cursor();
     if (extra_char != NUL)
-	putcmdline(extra_char, TRUE);
+	putcmdline(extra_char, extra_char_shift);
 
     /*
      * An emsg() before may have set msg_scroll. This is used in normal mode,