diff --git a/src/normal.c b/src/normal.c
index 9e617d9..87e2cd4 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5785,6 +5785,14 @@
 	curwin->w_valid &= ~VALID_WCOL;
     }
     curwin->w_set_curswant = TRUE;
+#ifdef FEAT_FOLDING
+    if (hasAnyFolding(curwin))
+    {
+	validate_cheight();
+	if (curwin->w_cline_folded)
+	    update_curswant_force();
+    }
+#endif
     adjust_skipcol();
 }