diff --git a/src/normal.c b/src/normal.c
index 2eb2c38..cbcfd74 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5821,6 +5821,10 @@
     oparg_T	*oap = cap->oap;
     int		i;
     int		col_off = curwin_col_off();
+    int		flag = FALSE;
+
+    if (cap->nchar == K_END)
+	flag = TRUE;
 
     oap->motion_type = MCHAR;
     oap->inclusive = TRUE;
@@ -5886,6 +5890,13 @@
 	// Make sure we stick in this column.
 	update_curswant_force();
     }
+    if (flag)
+    {
+	do
+	    i = gchar_cursor();
+	while (VIM_ISWHITE(i) && oneleft() == OK);
+	curwin->w_valid &= ~VALID_WCOL;
+    }
 }
 
 /*
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 31fbe77..92d1134 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -4104,4 +4104,22 @@
   let &mouse = save_mouse
 endfunc
 
+func Test_normal33_g_cmd_nonblank()
+  " Test that g$ goes to the last non-blank char and g<end> to the last
+  " visible column
+  20vnew
+  setlocal nowrap nonumber signcolumn=no
+  call setline(1, ['fooo   fooo         fooo   fooo         fooo   fooo         fooo   fooo        '])
+  exe "normal 0g\<end>"
+  call assert_equal(11, col('.'))
+  normal 0g$
+  call assert_equal(20, col('.'))
+  setlocal wrap
+  exe "normal 0g\<end>"
+  call assert_equal(11, col('.'))
+  normal 0g$
+  call assert_equal(20, col('.'))
+  bw!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index e2059c8..bb04cd3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1753,
+/**/
     1752,
 /**/
     1751,