2 files changed, 7 insertions, 0 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c
index 377ccd7596..078ce3d72c 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -286,6 +286,7 @@ void update_topline(win_T *wp)
     }
     wp->w_topline = 1;
     wp->w_botline = 2;
+    wp->w_skipcol = 0;
     wp->w_valid |= VALID_BOTLINE|VALID_BOTLINE_AP;
     wp->w_viewport_invalid = true;
     wp->w_scbind_pos = 1;
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 94e176bd94..2713dd2a45 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -4195,6 +4195,12 @@ static void qf_fill_buffer(qf_list_T *qfl, buf_T *buf, qfline_T *old_last, int q
       }
     }
 
+    FOR_ALL_TAB_WINDOWS(tp, wp) {
+      if (wp->w_buffer == curbuf) {
+        wp->w_skipcol = 0;
+      }
+    }
+
     // Remove all undo information
     u_clearallandblockfree(curbuf);
   }