diff --git a/src/window.c b/src/window.c
index b00ed97..f644f9b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4392,7 +4392,8 @@
     int		trigger_enter_autocmds,
     int		trigger_leave_autocmds)
 {
-    CHECK_CMDWIN;
+    if (trigger_enter_autocmds || trigger_leave_autocmds)
+	CHECK_CMDWIN;
 
     // Don't repeat a message in another tab page.
     set_keep_msg(NULL, 0);