diff --git a/lua/command-completion.lua b/lua/command-completion.lua
index 2487b48..18e5cc3 100644
--- a/lua/command-completion.lua
+++ b/lua/command-completion.lua
@@ -52,7 +52,7 @@ local function calc_col_width()
 end
 
 local function open_and_setup_win(height)
-  if not M.wbufnr then
+  if not M.wbufnr or f.bufexists(M.wbufnr) == 0 then
     M.wbufnr = n.create_buf(false, true)
   end