diff --git a/src/eval.c b/src/eval.c
index f55d9de..2dfe817 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6728,10 +6728,6 @@
     long	start_lnum = SOURCING_LNUM;
 
     ga_init2(&ga, 1, 80);
-#ifdef HAS_MESSAGE_WINDOW
-    if (eap->cmdidx == CMD_echowindow)
-	start_echowindow();
-#endif
 
     if (eap->skip)
 	++emsg_skip;
@@ -6796,11 +6792,21 @@
 	    msg_sb_eol();
 	}
 
-	if (eap->cmdidx == CMD_echomsg || eap->cmdidx == CMD_echowindow)
+	if (eap->cmdidx == CMD_echomsg)
 	{
 	    msg_attr(ga.ga_data, echo_attr);
 	    out_flush();
 	}
+	else if (eap->cmdidx == CMD_echowindow)
+	{
+#ifdef HAS_MESSAGE_WINDOW
+	    start_echowindow();
+#endif
+	    msg_attr(ga.ga_data, echo_attr);
+#ifdef HAS_MESSAGE_WINDOW
+	    end_echowindow();
+#endif
+	}
 	else if (eap->cmdidx == CMD_echoconsole)
 	{
 	    ui_write(ga.ga_data, (int)STRLEN(ga.ga_data), TRUE);
@@ -6832,10 +6838,6 @@
 
     if (eap->skip)
 	--emsg_skip;
-#ifdef HAS_MESSAGE_WINDOW
-    if (eap->cmdidx == CMD_echowindow)
-	end_echowindow();
-#endif
     set_nextcmd(eap, arg);
 }