diff --git a/src/search.c b/src/search.c
index a6b60f6..0c253e9 100644
--- a/src/search.c
+++ b/src/search.c
@@ -36,7 +36,7 @@
 static void cmdline_search_stat(int dirc, pos_T *pos, pos_T *cursor_pos, int show_top_bot_msg, char_u *msgbuf, int recompute, int maxcount, long timeout);
 static void update_search_stat(int dirc, pos_T *pos, pos_T *cursor_pos, searchstat_T *stat, int recompute, int maxcount, long timeout);
 
-#define SEARCH_STAT_DEF_TIMEOUT 20L
+#define SEARCH_STAT_DEF_TIMEOUT 40L
 #define SEARCH_STAT_DEF_MAX_COUNT 99
 #define SEARCH_STAT_BUF_LEN 12
 
diff --git a/src/testdir/test_search_stat.vim b/src/testdir/test_search_stat.vim
index 7c2a195..de73051 100644
--- a/src/testdir/test_search_stat.vim
+++ b/src/testdir/test_search_stat.vim
@@ -87,10 +87,10 @@
     \ searchcount(#{recompute: 0}))
   call assert_equal(
     \ #{current: 272, exact_match: 1, total: 280, incomplete: 0, maxcount: 0},
-    \ searchcount(#{recompute: v:true, maxcount: 0}))
+    \ searchcount(#{recompute: v:true, maxcount: 0, timeout: 200}))
   call assert_equal(
     \ #{current: 1, exact_match: 1, total: 280, incomplete: 0, maxcount: 0},
-    \ searchcount(#{recompute: 1, maxcount: 0, pos: [1, 1, 0]}))
+    \ searchcount(#{recompute: 1, maxcount: 0, pos: [1, 1, 0], timeout: 200}))
   call cursor(line('$'), 1)
   let g:a = execute(':unsilent :norm! n')
   let stat = 'W \[1/>99\]'
@@ -100,10 +100,10 @@
     \ searchcount(#{recompute: 0}))
   call assert_equal(
     \ #{current: 1, exact_match: 1, total: 280, incomplete: 0, maxcount: 0},
-    \ searchcount(#{recompute: 1, maxcount: 0}))
+    \ searchcount(#{recompute: 1, maxcount: 0, timeout: 200}))
   call assert_equal(
     \ #{current: 271, exact_match: 1, total: 280, incomplete: 0, maxcount: 0},
-    \ searchcount(#{recompute: 1, maxcount: 0, pos: [line('$')-2, 1, 0]}))
+    \ searchcount(#{recompute: 1, maxcount: 0, pos: [line('$')-2, 1, 0], timeout: 200}))
 
   " Many matches
   call cursor(1, 1)
diff --git a/src/version.c b/src/version.c
index dff6cf9..7931e96 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    884,
+/**/
     883,
 /**/
     882,