diff --git a/vim/plugin/himalaya.vim b/vim/plugin/himalaya.vim
index b3ebbfe..5c0a85c 100644
--- a/vim/plugin/himalaya.vim
+++ b/vim/plugin/himalaya.vim
@@ -1,11 +1,19 @@
-if exists("g:himalaya_loaded")
+if exists("g:loaded_himalaya")
   finish
 endif
 
-let g:himalaya_loaded = 1
-
 if !executable("himalaya")
   throw "Himalaya CLI not found, see https://github.com/soywod/himalaya#installation"
 endif
 
+" Backup cpo
+let s:cpo_backup = &cpo
+set cpo&vim
+
 command! -nargs=* Himalaya call himalaya#msg#list(<f-args>)
+
+" Restore cpo
+let &cpo = s:cpo_backup
+unlet s:cpo_backup
+
+let g:loaded_himalaya = 1