diff --git a/src/move.c b/src/move.c
index cd0af3e..0a98f03 100644
--- a/src/move.c
+++ b/src/move.c
@@ -868,6 +868,7 @@
 	curwin->w_wcol = col;
 
 	curwin->w_valid |= VALID_WCOL;
+	curwin->w_flags &= ~WFLAG_WCOL_OFF_ADDED;
     }
 }
 
@@ -1180,7 +1181,10 @@
     {
 	curwin->w_wrow += popup_top_extra(curwin);
 	curwin->w_wcol += popup_left_extra(curwin);
+	curwin->w_flags |= WFLAG_WCOL_OFF_ADDED + WFLAG_WROW_OFF_ADDED;
     }
+    else
+	curwin->w_flags &= ~(WFLAG_WCOL_OFF_ADDED + WFLAG_WROW_OFF_ADDED);
 #endif
 
     // now w_leftcol is valid, avoid check_cursor_moved() thinking otherwise