diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json
index 555e06a0..7533553b 100644
--- a/.config/nvim/lazyvim.json
+++ b/.config/nvim/lazyvim.json
@@ -15,7 +15,7 @@
     "plugins.extras.coding.treesitter.node-action",
     "plugins.extras.coding.treesitter.puppeteer",
     "plugins.extras.coding.treesitter.various-textobjs",
-    "plugins.extras.coding.yanky",
+    "plugins.extras.coding.yanky-extended",
     "plugins.extras.dap.core-extended",
     "plugins.extras.dap.persistent-breakpoints",
     "plugins.extras.editor.codesnap",
diff --git a/.config/nvim/lua/plugins/extras/coding/yanky-extended.lua b/.config/nvim/lua/plugins/extras/coding/yanky-extended.lua
new file mode 100644
index 00000000..d0e50a2c
--- /dev/null
+++ b/.config/nvim/lua/plugins/extras/coding/yanky-extended.lua
@@ -0,0 +1,38 @@
+return {
+  {
+    import = "lazyvim.plugins.extras.coding.yanky",
+  },
+  {
+    "gbprod/yanky.nvim",
+    opts = function(_, opts)
+      local utils = require("yanky.utils")
+      local mapping = require("yanky.telescope.mapping")
+
+      opts.highlight = { timer = 250 }
+      opts.picker = {
+        telescope = {
+          use_default_mappings = false,
+          mappings = {
+            default = mapping.put("p"),
+            i = {
+              ["<c-g>"] = mapping.put("p"),
+              ["<c-h>"] = mapping.put("P"),
+              ["<c-x>"] = mapping.delete(),
+              ["<c-r>"] = mapping.set_register(utils.get_default_register()),
+            },
+            n = {
+              p = mapping.put("p"),
+              P = mapping.put("P"),
+              d = mapping.delete(),
+              r = mapping.set_register(utils.get_default_register()),
+            },
+          },
+        },
+      }
+    end,
+    -- stylua: ignore
+    keys = {
+      {"<leader>sy", function() require("telescope").extensions.yank_history.yank_history({}) end, mode = {"n", "v"}, desc = "Yank History"},
+    },
+  },
+}