diff --git a/src/term.c b/src/term.c
index b7a82da..649e483 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4478,7 +4478,9 @@
 {
     OUT_STR(tgoto((char *)T_CS, (int)Rows - 1, 0));
     if (*T_CSV != NUL)
-	OUT_STR(tgoto((char *)T_CSV, Columns - 1, 0));
+	OUT_STR(tgoto((char *)T_CSV,
+		    firstwin->w_wincol + topframe->fr_width - 1,
+		    firstwin->w_wincol));
     screen_start();		    // don't know where cursor is now
 }
 
diff --git a/src/version.c b/src/version.c
index 5e34826..5630b8a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1430,
+/**/
     1429,
 /**/
     1428,
diff --git a/src/window.c b/src/window.c
index f3b23e8..46e1b63 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6226,7 +6226,14 @@
 
     if (!skip_win_fix_scroll)
 	win_fix_scroll(TRUE);
-
+#ifdef FEAT_GUI
+    if (gui.in_use)
+    {
+	if (scroll_region)
+	    scroll_region_reset();
+	scroll_start();	// may scroll the screen to the right position
+    }
+#endif
     redraw_tabline = TRUE;
 #if defined(FEAT_TABPANEL)
     redraw_tabpanel = TRUE;