diff --git a/.vimrc b/.vimrc
index 3d894fd..31fcf7d 100644
--- a/.vimrc
+++ b/.vimrc
@@ -38,7 +38,8 @@ set shell=bash\ -l
 
 " Shortcuts
 command! Proximate :e ~/Cloud/Notes/Proximate.md
-command! W :w|b#|bd#
+command! W w | bp | bw #
+command! Q :wa|qa
 command! -range Comment call CommentWrap(<line1>, <line2>)
 
 function! CommentWrap(start, end)