diff --git a/src/ex_getln.c b/src/ex_getln.c
index ed45f57..6dc5c35 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -6324,6 +6324,12 @@
 	    ccline.cmdbuff = vim_strsave((char_u *)"qa");
 	    cmdwin_result = CAR;
 	}
+	else if (cmdwin_result == Ctrl_C)
+	{
+	    /* :q or :close, don't execute any command
+	     * and don't modify the cmd window. */
+	    ccline.cmdbuff = NULL;
+	}
 	else
 	    ccline.cmdbuff = vim_strsave(ml_get_curline());
 	if (ccline.cmdbuff == NULL)