diff --git a/remap.lua b/remap.lua
index c1d79bd..8dd3d6f 100644
--- a/remap.lua
+++ b/remap.lua
@@ -128,3 +128,29 @@ function AddLocListEntry()
 end
 
 vim.keymap.set("n", "<leader>la", AddLocListEntry, { desc = "[L]ocation list [a]ppend current line" })
+vim.api.nvim_create_autocmd("FileType", {
+    pattern = "help",
+    callback = function()
+        vim.schedule(function()
+            vim.keymap.set("n", "<C-]>", function()
+                local word = vim.fn.expand('<cWORD>')
+
+                -- Extract tag from |tag| format used in help files
+                local tag = word:match('|([^|]+)|') or word
+
+                if tag then
+                    -- Remove any trailing special characters
+                    tag = tag:gsub('[^%w%-_*]', '')
+
+                    if tag ~= '' then
+                        local success = pcall(vim.cmd, 'tag ' .. tag)
+                        if not success then
+                            -- Try fuzzy search
+                            vim.cmd('tag /' .. tag)
+                        end
+                    end
+                end
+            end)
+        end)
+    end
+})