diff --git a/plugin/gnupg.vim b/plugin/gnupg.vim
index f26a314..b5011a6 100644
--- a/plugin/gnupg.vim
+++ b/plugin/gnupg.vim
@@ -1,5 +1,5 @@
 " Name:    gnupg.vim
-" Last Change: 2016 Dec 04
+" Last Change: 2016 Dec 14
 " Maintainer:  James McCoy <jamessan@jamessan.com>
 " Original Author:  Markus Braun <markus.braun@krawel.de>
 " Summary: Vim plugin for transparent editing of gpg encrypted files.
@@ -420,6 +420,9 @@ endfunction
 function s:GPGCleanup()
   call s:GPGDebug(3, ">>>>>>>> Entering s:GPGCleanup()")
 
+  " Ensure we can hide the buffer
+  setlocal bufhidden=hide
+
   " wipe out screen
   new +only
   redraw!