diff --git a/src/display.c b/src/display.c
index cff0464c0..adcbfca6a 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1859,6 +1859,9 @@ flush_screen(int cursor_on_u)
             }
     }
 
+    display_nhwindow(WIN_MAP, FALSE);
+    reset_glyph_bbox();
+
     /* get this done now, before we place the cursor on the hero */
     if (g.context.botl || g.context.botlx)
         bot();
@@ -1868,8 +1871,6 @@ flush_screen(int cursor_on_u)
     /* This needs to be the final thing done in flush_screen  */
     if (cursor_on_u)
         curs(WIN_MAP, u.ux, u.uy); /* move cursor to the hero */
-    display_nhwindow(WIN_MAP, FALSE);
-    reset_glyph_bbox();
     flushing = 0;
 }