diff --git a/src/insexpand.c b/src/insexpand.c
index 0e363f7..ee8263c 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -68,7 +68,7 @@
 static char *ctrl_x_mode_names[] = {
 	"keyword",
 	"ctrl_x",
-	"unknown",	    // CTRL_X_SCROLL
+	"scroll",
 	"whole_line",
 	"files",
 	"tags",
@@ -2539,7 +2539,8 @@
     static char_u *
 ins_compl_mode(void)
 {
-    if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET || compl_started)
+    if (ctrl_x_mode == CTRL_X_NOT_DEFINED_YET || ctrl_x_mode == CTRL_X_SCROLL
+	    || compl_started)
 	return (char_u *)ctrl_x_mode_names[ctrl_x_mode & ~CTRL_X_WANT_IDENT];
 
     return (char_u *)"";
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index 1d0a77c..0799df5 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -990,6 +990,10 @@
         \ ["\<C-X>", 'ctrl_x'],
         \ ["\<C-X>\<C-N>", 'keyword'],
         \ ["\<C-X>\<C-P>", 'keyword'],
+        \ ["\<C-X>\<C-E>", 'scroll'],
+        \ ["\<C-X>\<C-Y>", 'scroll'],
+        \ ["\<C-X>\<C-E>\<C-E>\<C-Y>", 'scroll'],
+        \ ["\<C-X>\<C-Y>\<C-E>\<C-Y>", 'scroll'],
         \ ["\<C-X>\<C-L>", 'whole_line'],
         \ ["\<C-X>\<C-F>", 'files'],
         \ ["\<C-X>\<C-]>", 'tags'],
diff --git a/src/version.c b/src/version.c
index 4e4f4fd..79f88eb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3465,
+/**/
     3464,
 /**/
     3463,