diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index d189c3e..4abfd4a 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -165,7 +165,7 @@ function! s:Map(mode, lhs, rhs, ...) abort
     let head = substitute(head, '<[^<>]*>$\|.$', '', '')
   endwhile
   if flags !~# '<unique>' || empty(mapcheck(head.tail, a:mode))
-    exe a:mode.'map <buffer>' flags head.tail a:rhs
+    exe a:mode.'map <buffer>' s:nowait flags head.tail a:rhs
     if a:0 > 1
       let b:undo_ftplugin = get(b:, 'undo_ftplugin', 'exe') .
             \ '|sil! exe "' . a:mode . 'unmap <buffer> ' . head.tail . '"'