diff --git a/nvim/.config/nvim/after/plugin/fugitive.vim b/nvim/.config/nvim/after/plugin/fugitive.vim
index fd6d9a1..e6b49d8 100644
--- a/nvim/.config/nvim/after/plugin/fugitive.vim
+++ b/nvim/.config/nvim/after/plugin/fugitive.vim
@@ -14,6 +14,8 @@ nnoremap <Leader>gF :call git#git_fetch_origin_merge()<CR>
 nnoremap <Leader>gg :Git<CR>
 nnoremap <Leader>gh :Git log --grep=
 nnoremap <Leader>gH :<C-U>Git log -G<C-r><C-w>
+nnoremap <Leader>gk :call git#git_review()<CR>
+nnoremap <Leader>gK :call git#git_review_fileview()<CR>
 nnoremap <Leader>gl :Git log --stat %<CR>
 nnoremap <Leader>gL :Git log --stat -n 100<CR>
 xnoremap <Leader>gl :<C-U>call git#git_log_range()<CR>
@@ -23,7 +25,7 @@ nnoremap <Leader>gM :call git#git_merge_origin()<CR>
 nnoremap <Leader>gn :Git branch -m<SPACE>
 nnoremap <Leader>go :call git#git_log_compare()<CR>
 nnoremap <Leader>gr :call git#git_rebase_origin()<CR>
-nnoremap <Leader>gR :call git#git_review()<CR>
+nnoremap <Leader>gR :Git rebase --abort<CR>
 nnoremap <Leader>g- :call git#git_stash()<CR>:e<CR>
 nnoremap <Leader>g+ :Git stash pop stash@
 nnoremap <Leader>gs :Git stash list<CR>
diff --git a/nvim/.config/nvim/autoload/git.vim b/nvim/.config/nvim/autoload/git.vim
index d095dd4..364edb8 100644
--- a/nvim/.config/nvim/autoload/git.vim
+++ b/nvim/.config/nvim/autoload/git.vim
@@ -274,11 +274,19 @@ function! git#git_rebase_origin() abort
   execute "Git rebase origin/" . default[3]
 endfunction
 
-" Opens the output of Git diff main...<current_branch> in a tab for review
+" Opens the output of Git difftool main...<current_branch> for review
 function! git#git_review() abort
   let default = split(trim(system('git symbolic-ref refs/remotes/origin/HEAD')), '/')
   let current = trim(system("git branch --show-current"))
-  execute "Gtabedit | Git diff " . default[3] . "..." . current . "| only"
+  execute "Gtabedit | Git difftool " . default[3] . "..." . current
+endfunction
+
+" Opens the output of Git difftool main...<current_branch> for review. Each
+" file is opened in a tab.
+function! git#git_review_fileview() abort
+  let default = split(trim(system('git symbolic-ref refs/remotes/origin/HEAD')), '/')
+  let current = trim(system("git branch --show-current"))
+  execute "Git difftool -y " . default[3] . "..." . current
 endfunction
 
 " Generate a helpful name when using Git stash