diff --git a/.config/nvim/lua/maps.lua b/.config/nvim/lua/maps.lua
index ea2cd05d..23b0c8d0 100644
--- a/.config/nvim/lua/maps.lua
+++ b/.config/nvim/lua/maps.lua
@@ -80,6 +80,14 @@ vim.keymap.set("n", "<leader>gh", ":diffget //3<CR>")
 vim.keymap.set("n", "<leader>gb", ":Git blame<CR>")
 vim.keymap.set("n", "<leader>gB", ":Git blame --ignore-revs-file=.git-blame-ignore-revs<CR>")
 
+vim.api.nvim_create_autocmd("WinClosed", {
+    group = vim.api.nvim_create_augroup("conf_fugitive_prevwin", {}),
+    callback = function(args)
+        local win = tonumber(args.match)
+        if win == vim.api.nvim_get_current_win() and vim.bo.filetype == "fugitive" then vim.cmd.wincmd("p") end
+    end,
+})
+
 -- NoNeckPain
 vim.keymap.set("n", "<leader>z", ":NoNeckPain<CR>")