diff --git a/lua/snacks/scroll.lua b/lua/snacks/scroll.lua
index 607d7fc59..bf9d02eb5 100644
--- a/lua/snacks/scroll.lua
+++ b/lua/snacks/scroll.lua
@@ -201,6 +201,17 @@ function M.enable()
     end),
   })
 
+  -- clean up state when a window is closed
+  vim.api.nvim_create_autocmd("WinClosed", {
+    group = group,
+    callback = function(ev)
+      local win = tonumber(ev.match)
+      if win then
+        State.reset(win)
+      end
+    end,
+  })
+
   -- clear scroll state when leaving the cmdline after a search with incsearch
   vim.api.nvim_create_autocmd({ "CmdlineLeave" }, {
     group = group,