diff --git a/src/window.c b/src/window.c
index 6fefcac..fc7b8df 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6410,6 +6410,10 @@
 
     if (wp->w_buffer->b_ml.ml_line_count < wp->w_height)
 	return;
+#ifdef FEAT_CMDWIN
+    if (skip_win_fix_cursor)
+	return;
+#endif
 
     so = MIN(wp->w_height / 2, so);
     // Check if cursor position is above topline or below botline.