diff --git a/.config/nvim/plugin/gitsigns.lua b/.config/nvim/plugin/gitsigns.lua
index 25a295dd..4fd5a39c 100644
--- a/.config/nvim/plugin/gitsigns.lua
+++ b/.config/nvim/plugin/gitsigns.lua
@@ -1,6 +1,6 @@
 require("gitsigns").setup {
     on_attach = function(bufnr)
-        local gs = package.loaded.gitsigns
+        local gitsigns = package.loaded.gitsigns
 
         local function map(mode, l, r, opts)
             opts = opts or {}
@@ -9,30 +9,43 @@ require("gitsigns").setup {
         end
 
         -- Navigation
-        map("n", "<leader>hj", gs.next_hunk)
-        map("n", "<leader>hk", gs.prev_hunk)
+        map('n', ']c', function()
+            if vim.wo.diff then
+                vim.cmd.normal({ ']c', bang = true })
+            else
+                gitsigns.nav_hunk('next')
+            end
+        end)
+
+        map('n', '[c', function()
+            if vim.wo.diff then
+                vim.cmd.normal({ '[c', bang = true })
+            else
+                gitsigns.nav_hunk('prev')
+            end
+        end)
 
         -- Actions
-        map("n", "<leader>hs", gs.stage_hunk)
-        map("n", "<leader>hu", gs.undo_stage_hunk)
-        map("n", "<leader>hr", gs.reset_hunk)
+        map("n", "<leader>hs", gitsigns.stage_hunk)
+        map("n", "<leader>hu", gitsigns.undo_stage_hunk)
+        map("n", "<leader>hr", gitsigns.reset_hunk)
 
-        map("v", "<leader>hs", function() gs.stage_hunk { vim.fn.line("."), vim.fn.line("v") } end)
-        map("v", "<leader>hr", function() gs.reset_hunk { vim.fn.line("."), vim.fn.line("v") } end)
+        map("v", "<leader>hs", function() gitsigns.stage_hunk { vim.fn.line("."), vim.fn.line("v") } end)
+        map("v", "<leader>hr", function() gitsigns.reset_hunk { vim.fn.line("."), vim.fn.line("v") } end)
 
-        map("n", "<leader>hS", gs.stage_buffer)
-        map("n", "<leader>hR", gs.reset_buffer)
+        map("n", "<leader>hS", gitsigns.stage_buffer)
+        map("n", "<leader>hR", gitsigns.reset_buffer)
 
-        map("n", "<leader>hp", gs.preview_hunk)
-        map("n", "<leader>hb", function() gs.blame_line { full = true } end)
-        map("n", "<leader>tb", gs.toggle_current_line_blame)
+        map("n", "<leader>hp", gitsigns.preview_hunk)
+        map("n", "<leader>hb", function() gitsigns.blame_line { full = true } end)
+        map("n", "<leader>tb", gitsigns.toggle_current_line_blame)
 
-        map("n", "<leader>hd", gs.diffthis)
-        map("n", "<leader>hD", function() gs.diffthis("~") end)
+        map("n", "<leader>hd", gitsigns.diffthis)
+        map("n", "<leader>hD", function() gitsigns.diffthis("~") end)
 
-        map("n", "<leader>pd", gs.toggle_deleted)
+        map("n", "<leader>td", gitsigns.toggle_deleted)
 
         -- Text object
-        map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>")
+        map({ "o", "x" }, "ih", gitsigns.select_hunk)
     end,
 }