diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index a9d650d..afcb45b 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -85,17 +85,6 @@ local on_attach = function(client, bufnr)
 
   lspKeys(client, bufnr)
 
-  if client.server_capabilities.documentHighlightProvider then
-    vim.keymap.set(
-      'n',
-      '<return>',
-      function ()
-        vim.lsp.buf.clear_references()
-        vim.lsp.buf.document_highlight()
-      end,
-      vim.tbl_extend('error', { noremap = true, silent = false, buffer = bufnr }, { desc = 'Document highlight' })
-    )
-  end
   if client.server_capabilities.documentSymbolProvider then
     local navic = require('nvim-navic')
     navic.attach(client, bufnr)
diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua
index e840363..c7a1b69 100644
--- a/lua/plugins/snacks.lua
+++ b/lua/plugins/snacks.lua
@@ -36,5 +36,21 @@ return {
       end,
       desc = 'Lazygit Log (cwd)',
     },
+    {
+      '<return>',
+      function()
+        Snacks.words.jump(vim.v.count1)
+      end,
+      desc = 'Next Reference',
+      mode = { 'n'  },
+    },
+    {
+      '<S-CR>',
+      function()
+        Snacks.words.jump(-vim.v.count1)
+      end,
+      desc = 'Prev Reference',
+      mode = { 'n' },
+    },
   },
 }