diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 8e2868108b..f9170b0c93 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1728,9 +1728,6 @@ void enter_buffer(buf_T *buf)
   // mark cursor position as being invalid
   curwin->w_valid = 0;
 
-  buflist_setfpos(curbuf, curwin, curbuf->b_last_cursor.mark.lnum,
-                  curbuf->b_last_cursor.mark.col, true);
-
   // Make sure the buffer is loaded.
   if (curbuf->b_ml.ml_mfp == NULL) {    // need to load the file
     // If there is no filetype, allow for detecting one.  Esp. useful for
diff --git a/test/old/testdir/test_buffer.vim b/test/old/testdir/test_buffer.vim
index cf4d264066..19799a5478 100644
--- a/test/old/testdir/test_buffer.vim
+++ b/test/old/testdir/test_buffer.vim
@@ -609,4 +609,31 @@ func Test_closed_buffer_still_in_window()
   %bw!
 endfunc
 
+" Cursor position should be restored when switching to a buffer previously
+" viewed in a window, regardless of whether it's visible in another one.
+func Test_switch_to_previously_viewed_buffer()
+  set nostartofline
+  new Xviewbuf
+  call setline(1, range(1, 200))
+  let oldwin = win_getid()
+  vsplit
+
+  call cursor(100, 3)
+  edit Xotherbuf
+  buffer Xviewbuf
+  call assert_equal([0, 100, 3, 0], getpos('.'))
+
+  exe win_id2win(oldwin) .. 'close'
+  setlocal bufhidden=hide
+
+  call cursor(200, 3)
+  edit Xotherbuf
+  buffer Xviewbuf
+  call assert_equal([0, 200, 3, 0], getpos('.'))
+
+  bwipe! Xotherbuf
+  bwipe! Xviewbuf
+  set startofline&
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab