diff --git a/src/normal.c b/src/normal.c
index adc7541..4db90d6 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -3406,8 +3406,8 @@
       {
 	if (dir == BACKWARD)
 	{
-	    if ((long)curwin->w_curswant >= width2)
-		/* move back within line */
+	    if ((long)curwin->w_curswant > width2)
+		// move back within line
 		curwin->w_curswant -= width2;
 	    else
 	    {
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index c6df183..dcfa929 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -2633,3 +2633,25 @@
   call assert_equal('100 foobar foobar fo', getreg(0))
   bw!
 endfunc
+
+func Test_normal_gk()
+  " needs 80 column new window
+  new
+  vert 80new
+  put =[repeat('x',90)..' {{{1', 'x {{{1']
+  norm! gk
+  " In a 80 column wide terminal the window will be only 78 char
+  " (because Vim will leave space for the other window),
+  " but if the terminal is larger, it will be 80 chars, so verify the
+  " cursor column correctly.
+  call assert_equal(winwidth(0)+1, col('.'))
+  call assert_equal(winwidth(0)+1, virtcol('.'))
+  norm! j
+  call assert_equal(6, col('.'))
+  call assert_equal(6, virtcol('.'))
+  norm! gk
+  call assert_equal(95, col('.'))
+  call assert_equal(95, virtcol('.'))
+  bw!
+  bw!
+endfunc
diff --git a/src/version.c b/src/version.c
index 840c257..ec9aa76 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2072,
+/**/
     2071,
 /**/
     2070,