diff --git a/python/ycm/tests/vimsupport_test.py b/python/ycm/tests/vimsupport_test.py
index 131a4360..ab95d0e5 100644
--- a/python/ycm/tests/vimsupport_test.py
+++ b/python/ycm/tests/vimsupport_test.py
@@ -1262,6 +1262,8 @@ def WriteToPreviewWindow_test( vim_current, vim_command ):
     call( 'modifiable', True ),
     call( 'readonly', False ),
     call( 'buftype', 'nofile' ),
+    call( 'bufhidden', 'wipe' ),
+    call( 'buflisted', False ),
     call( 'swapfile', False ),
     call( 'modifiable', False ),
     call( 'modified', False ),
diff --git a/python/ycm/vimsupport.py b/python/ycm/vimsupport.py
index 5ca2c46c..f30de92a 100644
--- a/python/ycm/vimsupport.py
+++ b/python/ycm/vimsupport.py
@@ -928,6 +928,8 @@ def WriteToPreviewWindow( message ):
     vim.current.buffer[:] = message.splitlines()
 
     vim.current.buffer.options[ 'buftype' ]    = 'nofile'
+    vim.current.buffer.options[ 'bufhidden' ]  = 'wipe'
+    vim.current.buffer.options[ 'buflisted' ]  = False
     vim.current.buffer.options[ 'swapfile' ]   = False
     vim.current.buffer.options[ 'modifiable' ] = False
     vim.current.buffer.options[ 'readonly' ]   = True