1 files changed, 4 insertions, 6 deletions
diff --git a/lua/telescope/mappings.lua b/lua/telescope/mappings.lua
index b78923f..27e5d07 100644
--- a/lua/telescope/mappings.lua
+++ b/lua/telescope/mappings.lua
@@ -221,6 +221,10 @@ mappings.apply_keymap = function(prompt_bufnr, attach_mappings, buffer_keymap)
       end
     end
   end
+
+  vim.cmd(
+    string.format([[autocmd BufDelete %s :lua require('telescope.mappings').clear(%s)]], prompt_bufnr, prompt_bufnr)
+  )
 end
 
 mappings.execute_keymap = function(prompt_bufnr, keymap_identifier)
@@ -233,12 +237,6 @@ mappings.execute_keymap = function(prompt_bufnr, keymap_identifier)
 end
 
 mappings.clear = function(prompt_bufnr)
-  require("telescope.actions.mt").clear_all()
-  -- TODO(conni2461): This seems like the better solution but it won't clear actions that were never mapped
-  -- for _, v in ipairs(keymap_store[prompt_bufnr]) do
-  --   pcall(v.clear)
-  -- end
-
   keymap_store[prompt_bufnr] = nil
 end