diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index fbebed1..a3f45ca 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -1826,6 +1826,8 @@ function! fugitive#BufReadStatus() abort
     nnoremap <buffer> <silent> d? :<C-U>help fugitive_d<CR>
     nnoremap <buffer> <silent> P :<C-U>execute <SID>StagePatch(line('.'),line('.')+v:count1-1)<CR>
     xnoremap <buffer> <silent> P :<C-U>execute <SID>StagePatch(line("'<"),line("'>"))<CR>
+    nnoremap <buffer> <silent> I :<C-U>execute <SID>StagePatch(line('.'),line('.'))<CR>
+    xnoremap <buffer> <silent> I :<C-U>execute <SID>StagePatch(line("'<"),line("'>"))<CR>
     if empty(mapcheck('q', 'n'))
       nnoremap <buffer> <silent> q :<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<CR>
     endif
@@ -2958,7 +2960,7 @@ function! s:DoUnstageStaged(record) abort
 endfunction
 
 function! s:DoToggleUnstaged(record) abort
-  if a:record.patch
+  if a:record.patch && a:record.status !=# 'A'
     return s:StageApply(a:record, 0, ['--cached'])
   else
     call s:TreeChomp(['add', '-A', '--'] + a:record.paths)
diff --git a/doc/fugitive.txt b/doc/fugitive.txt
index b702e83..92a6e71 100644
--- a/doc/fugitive.txt
+++ b/doc/fugitive.txt
@@ -274,8 +274,9 @@ X                       Discard the change under the cursor.  This uses
 gI                      Open .git/info/exclude in a split and add the file
                         under the cursor.  Use a count to open .gitignore.
 
-P                       Invoke |:Git| add --patch or reset --patch on the file
-                        under the cursor. On untracked files, this instead
+                                                *fugitive_I*
+I                       Invoke |:Git| add --patch or reset --patch on the file
+P                       under the cursor. On untracked files, this instead
                         calls |:Git| add --intent-to-add.
 
                                                 *fugitive_d*