diff --git a/src/window.c b/src/window.c
index d9d3401..2e12043 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3375,6 +3375,8 @@
 
     // avoid an error for switching tabpage with the cmdline window open
     cmdwin_type = 0;
+    cmdwin_buf = NULL;
+    cmdwin_win = NULL;
 
     while (first_tabpage->tp_next != NULL)
 	tabpage_close(TRUE);