diff --git a/lua/easytables/window.lua b/lua/easytables/window.lua
index 1f557fc..53b5eee 100644
--- a/lua/easytables/window.lua
+++ b/lua/easytables/window.lua
@@ -170,6 +170,15 @@ function M:register_listeners()
         end,
     })
 
+    vim.api.nvim_create_autocmd(
+        { "QuitPre" },
+        {
+            callback = function()
+                self:close()
+            end
+        }
+    )
+
     vim.api.nvim_buf_create_user_command(
         self.prompt_buffer,
         "JumpToNextCell",