diff --git a/src/popupwin.c b/src/popupwin.c
index 5f00380..a33fa5f 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -4545,6 +4545,8 @@
     void
 end_echowindow(void)
 {
+    in_echowindow = FALSE;
+
     // show the message window now
     redraw_cmd(FALSE);
 
@@ -4553,7 +4555,6 @@
     msg_didout = TRUE;
     if (msg_col == 0)
 	msg_col = 1;
-    in_echowindow = FALSE;
 }
 #endif