diff --git a/src/register.c b/src/register.c
index 3ddacb8ee..f034c645b 100644
--- a/src/register.c
+++ b/src/register.c
@@ -2205,6 +2205,9 @@ error:
 		{
 		    curwin->w_cursor.lnum = new_lnum;
 		    curwin->w_cursor.col = col;
+		    curbuf->b_op_end = curwin->w_cursor;
+		    if (col > 1)
+			curbuf->b_op_end.col = col - 1;
 		}
 	    }
 	    else if (y_type == MLINE)
diff --git a/src/testdir/test_put.vim b/src/testdir/test_put.vim
index f03433628..f3a320f46 100644
--- a/src/testdir/test_put.vim
+++ b/src/testdir/test_put.vim
@@ -126,8 +126,10 @@ func Test_gp_with_count_leaves_cursor_at_end()
   new
   call setline(1, '<---->')
   call setreg('@', "foo\nbar", 'c')
-  exe "normal 1G3|3gpix\<Esc>"
-  call assert_equal(['<--foo', 'barfoo', 'barfoo', 'barx-->'], getline(1, '$'))
+  normal 1G3|3gp
+  call assert_equal([0, 4, 4, 0], getpos("."))
+  call assert_equal(['<--foo', 'barfoo', 'barfoo', 'bar-->'], getline(1, '$'))
+  call assert_equal([0, 4, 3, 0], getpos("']"))
 
   bwipe!
 endfunc
diff --git a/src/version.c b/src/version.c
index fb36b14a1..6865fa5c5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3455,
 /**/
     3454,
 /**/