diff --git a/autoload/gitgutter.vim b/autoload/gitgutter.vim
index b413834..1f237ab 100644
--- a/autoload/gitgutter.vim
+++ b/autoload/gitgutter.vim
@@ -126,10 +126,10 @@ function! gitgutter#setup_maps()
     nmap <buffer> ]c <Plug>GitGutterNextHunk
   endif
 
-  if !hasmapto('<Plug>GitGutterStageHunk') && maparg('<Leader>hs', 'x') ==# ''
+  if !hasmapto('<Plug>GitGutterStageHunk', 'v') && maparg('<Leader>hs', 'x') ==# ''
     xmap <buffer> <Leader>hs <Plug>GitGutterStageHunk
   endif
-  if !hasmapto('<Plug>GitGutterStageHunk') && maparg('<Leader>hs', 'n') ==# ''
+  if !hasmapto('<Plug>GitGutterStageHunk', 'n') && maparg('<Leader>hs', 'n') ==# ''
     nmap <buffer> <Leader>hs <Plug>GitGutterStageHunk
   endif
   if !hasmapto('<Plug>GitGutterUndoHunk') && maparg('<Leader>hu', 'n') ==# ''