diff --git a/src/search.c b/src/search.c
index fd668383b..45e4f9c1a 100644
--- a/src/search.c
+++ b/src/search.c
@@ -3047,7 +3047,7 @@ current_search(
     curwin->w_cursor = end_pos;
     if (LT_POS(VIsual, end_pos) && forward)
 	dec_cursor();
-    else if (VIsual_active && LT_POS(curwin->w_cursor, VIsual))
+    else if (VIsual_active && LT_POS(curwin->w_cursor, VIsual) && forward)
 	curwin->w_cursor = pos;   // put the cursor on the start of the match
     VIsual_active = TRUE;
     VIsual_mode = 'v';
diff --git a/src/testdir/test_gn.vim b/src/testdir/test_gn.vim
index b90aa5f1d..a2a7ac3f0 100644
--- a/src/testdir/test_gn.vim
+++ b/src/testdir/test_gn.vim
@@ -172,7 +172,16 @@ func Test_gn_command()
   normal 0wgNy
   call assert_equal('one', @")
   set selection&
-endfu
+endfunc
+
+func Test_gN_repeat()
+  new
+  call setline(1, 'this list is a list with a list of a list.')
+  /list
+  normal $gNgNgNx
+  call assert_equal('list with a list of a list', @")
+  bwipe!
+endfunc
 
 func Test_gn_multi_line()
   new
diff --git a/src/version.c b/src/version.c
index e0bcc9012..e30c02dd1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1823,
 /**/
     1822,
 /**/