diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index e80621b37..1cb0734ec 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1459,6 +1459,8 @@ func Test_popup_scrollbar()
   call VerifyScreenDump(buf, 'Test_popupwin_scroll_6', {})
 
   call term_sendkeys(buf, ":call ScrollDown()\<CR>")
+  " wait a bit, otherwise it fails sometimes (double click recognized?)
+  sleep 100m
   call term_sendkeys(buf, ":call ScrollDown()\<CR>")
   call VerifyScreenDump(buf, 'Test_popupwin_scroll_7', {})
 
diff --git a/src/version.c b/src/version.c
index 26a9bf583..9c29b46d8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1604,
 /**/
     1603,
 /**/