diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 9169239..9cec810 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -1844,6 +1844,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>
+    call s:Map('n', 'p', ":<C-U>if v:count<Bar>silent exe <SID>GF('pedit')<Bar>else<Bar>echoerr 'Use = for inline diff, P for :Git add/reset --patch, 1p for :pedit'<Bar>endif<CR>", '<silent>')
+    call s:Map('x', 'p', ":<C-U>execute <SID>StagePatch(line(\"'<\"),line(\"'>\"))<CR>", '<silent>')
     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'))
diff --git a/doc/fugitive.txt b/doc/fugitive.txt
index 0198d1a..b30515a 100644
--- a/doc/fugitive.txt
+++ b/doc/fugitive.txt
@@ -332,6 +332,11 @@ gO                      Open the file or |fugitive-object| under the cursor in
 O                       Open the file or |fugitive-object| under the cursor in
                         a new tab.
 
+                                                *fugitive_p*
+p                       Open the file or |fugitive-object| under the cursor in
+                        a preview window.  In the status buffer, 1p is
+                        required to bypass the legacy usage instructions.
+
                                                 *fugitive_~*
 ~                       Open the current file in the [count]th first ancestor.