diff --git a/src/edit.c b/src/edit.c
index 74bbd9a..88fd18a 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3380,6 +3380,9 @@
     if (compl_leader != NULL)
     {
 	ins_compl_new_leader();
+	if (compl_shown_match != NULL)
+	    /* Make sure current match is not a hidden item. */
+	    compl_curr_match = compl_shown_match;
 	return NUL;
     }
     return K_BS;
diff --git a/src/version.c b/src/version.c
index b6e4f38..7c1e274 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    854,
+/**/
     853,
 /**/
     852,