diff --git a/lua/custom/plugins/harpoon.lua b/lua/custom/plugins/harpoon.lua
new file mode 100644
index 00000000..639b66f9
--- /dev/null
+++ b/lua/custom/plugins/harpoon.lua
@@ -0,0 +1,37 @@
+return {
+  'ThePrimeagen/harpoon',
+  branch = 'harpoon2',
+  dependencies = { 'nvim-lua/plenary.nvim' },
+  init = function()
+    local harpoon = require 'harpoon'
+
+    harpoon:setup()
+    vim.keymap.set('n', '<leader>a', function()
+      harpoon:list():add()
+    end)
+    vim.keymap.set('n', '<C-e>', function()
+      harpoon.ui:toggle_quick_menu(harpoon:list())
+    end)
+
+    vim.keymap.set('n', '<C-h>', function()
+      harpoon:list():select(1)
+    end)
+    vim.keymap.set('n', '<C-t>', function()
+      harpoon:list():select(2)
+    end)
+    vim.keymap.set('n', '<C-n>', function()
+      harpoon:list():select(3)
+    end)
+    vim.keymap.set('n', '<C-s>', function()
+      harpoon:list():select(4)
+    end)
+
+    -- Toggle previous & next buffers stored within Harpoon list
+    vim.keymap.set('n', '<C-S-P>', function()
+      harpoon:list():prev()
+    end)
+    vim.keymap.set('n', '<C-S-N>', function()
+      harpoon:list():next()
+    end)
+  end,
+}