diff --git a/src/edit.c b/src/edit.c
index 482e644..852060b 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -8537,6 +8537,7 @@
     ++no_u_sync;
     if (regname == '=')
     {
+	pos_T	curpos = curwin->w_cursor;
 # ifdef HAVE_INPUT_METHOD
 	int	im_on = im_get_status();
 # endif
@@ -8545,8 +8546,12 @@
 	u_sync_once = 2;
 
 	regname = get_expr_register();
+
+	// Cursor may be moved back a column.
+	curwin->w_cursor = curpos;
+	check_cursor();
 # ifdef HAVE_INPUT_METHOD
-	/* Restore the Input Method. */
+	// Restore the Input Method.
 	if (im_on)
 	    im_set_active(TRUE);
 # endif
diff --git a/src/ex_getln.c b/src/ex_getln.c
index fc48a9b..9400b20 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -7268,6 +7268,10 @@
     /* Don't execute autocommands while creating the window. */
     block_autocmds();
 
+    // When using completion in Insert mode with <C-R>=<C-F> one can open the
+    // command line window, but we don't want the popup menu then.
+    pum_undisplay();
+
     /* don't use a new tab page */
     cmdmod.tab = 0;
     cmdmod.noswapfile = 1;
diff --git a/src/version.c b/src/version.c
index f33f850..0aa15d7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    792,
+/**/
     791,
 /**/
     790,