diff --git a/src/edit.c b/src/edit.c
index b76ebe5..6f8dc49 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -3467,7 +3467,6 @@
     }
 
     compl_enter_selects = !compl_used_match;
-    compl_shown_match = compl_curr_match = compl_first_match;
 
     /* Show the popup menu with a different set of matches. */
     ins_compl_show_pum();
diff --git a/src/version.c b/src/version.c
index 97657b6..abed945 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    18,
+/**/
     17,
 /**/
     16,