diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua
index 5ed16288..a9db967e 100644
--- a/.config/nvim/after/plugin/lsp.lua
+++ b/.config/nvim/after/plugin/lsp.lua
@@ -82,7 +82,6 @@ local on_attach = function(client, bufno)
 
     map("n", "K", vim.lsp.buf.hover, opts)
     map("n", "<C-k>", vim.lsp.buf.signature_help, opts)
-    map("n", "gD", vim.lsp.buf.declaration, opts)
     map("n", "gd", vim.lsp.buf.definition, opts)
     -- conflicts with tabs
     -- map("n", "gtd", vim.lsp.buf.type_definition, opts)
diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua
index f020e91c..348bff1e 100644
--- a/.config/nvim/lua/maps.lua
+++ b/.config/nvim/lua/maps.lua
@@ -12,6 +12,7 @@ vim.keymap.set("v", "=", "=gv")
 vim.keymap.set("n", "<C-d>", "<C-d>zz")
 vim.keymap.set("n", "<C-u>", "<C-u>zz")
 vim.keymap.set("n", "gd", "gdzz")
+vim.keymap.set("n", "gD", "<C-w><C-v><C-w>wgd", { remap = true })
 vim.keymap.set("n", "``", "``zz")
 vim.keymap.set("n", "n", "nzzzv")
 vim.keymap.set("n", "N", "Nzzzv")