diff --git a/src/edit.c b/src/edit.c
index 6f8dc49..0c6089b 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -5183,8 +5183,14 @@
 	}
 	else if (ctrl_x_mode == CTRL_X_FILES)
 	{
-	    while (--startcol >= 0 && vim_isfilec(line[startcol]))
-		;
+	    char_u	*p = line + startcol;
+
+	    /* Go back to just before the first filename character. */
+	    mb_ptr_back(line, p);
+	    while (vim_isfilec(PTR2CHAR(p)) && p >= line)
+		mb_ptr_back(line, p);
+	    startcol = p - line;
+
 	    compl_col += ++startcol;
 	    compl_length = (int)curs_col - startcol;
 	    compl_pattern = addstar(line + compl_col, compl_length,
diff --git a/src/version.c b/src/version.c
index abed945..0e6dc1c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    19,
+/**/
     18,
 /**/
     17,