diff --git a/src/insexpand.c b/src/insexpand.c
index af818d4..d424fff 100644
--- a/src/insexpand.c
+++ b/src/insexpand.c
@@ -3546,7 +3546,8 @@
     int idx_b = *(const int *)b;
     int score_a = compl_fuzzy_scores[idx_a];
     int score_b = compl_fuzzy_scores[idx_b];
-    return (score_a > score_b) ? -1 : (score_a < score_b) ? 1 : 0;
+    return score_a == score_b ? (idx_a == idx_b ? 0 : (idx_a < idx_b ? -1 : 1))
+			: (score_a > score_b ? -1 : 1);
 }
 
 /*
diff --git a/src/search.c b/src/search.c
index e5936d8..a7fd44e 100644
--- a/src/search.c
+++ b/src/search.c
@@ -5217,7 +5217,7 @@
 {
     pos_T	current_pos = *pos;
     pos_T	circly_end;
-    int		found_new_match = FAIL;
+    int		found_new_match = FALSE;
     int		looped_around = FALSE;
 
     if (whole_line)
diff --git a/src/testdir/dumps/Test_pum_highlights_15.dump b/src/testdir/dumps/Test_pum_highlights_15.dump
index e923b43..199f753 100644
--- a/src/testdir/dumps/Test_pum_highlights_15.dump
+++ b/src/testdir/dumps/Test_pum_highlights_15.dump
@@ -1,4 +1,4 @@
-|/+0&#ffffff0|n|o|n|_|e|x|i|t|_|f|o|l|d|e|r> @58
+|/+0&#ffffff0|n|o|n|_|e|x|i|s|t|i|n|g|_|f|o|l|d|e|r> @54
 |~+0#4040ff13&| @73
 |~| @73
 |~| @73
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim
index fe958da..caec8ff 100644
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -1494,7 +1494,7 @@
   call VerifyScreenDump(buf, 'Test_pum_highlights_11', {})
 
   " issue #15357
-  call term_sendkeys(buf, "\<ESC>S/non_exit_folder\<C-X>\<C-F>")
+  call term_sendkeys(buf, "\<ESC>S/non_existing_folder\<C-X>\<C-F>")
   call TermWait(buf, 50)
   call VerifyScreenDump(buf, 'Test_pum_highlights_15', {})
 
diff --git a/src/version.c b/src/version.c
index 44137b7..6d374eb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    705,
+/**/
     704,
 /**/
     703,