diff --git a/src/screen.c b/src/screen.c
index 4ddded9bf..7c4ee3064 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -764,6 +764,8 @@ update_screen(int type)
 	    gui.col = gui_cursor_col;
 	    gui.row = gui_cursor_row;
 	    gui_update_cursor(FALSE, FALSE);
+	    screen_cur_col = gui.col;
+	    screen_cur_row = gui.row;
 	}
 	gui_update_scrollbars(FALSE);
     }
diff --git a/src/version.c b/src/version.c
index 598135cc5..3429bf015 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2004,
 /**/
     2003,
 /**/