diff --git a/bin/edit-encrypted-file b/bin/edit-encrypted-file
index 6d42108c..402a0c87 100755
--- a/bin/edit-encrypted-file
+++ b/bin/edit-encrypted-file
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/bin/sh -e
 # Written in 2012 by Suraj N. Kurapati <https://github.com/sunaku>
-vim --version | fgrep -q '+cryptv' &&
-vim -u NONE -c "set $(tr '\n' ' ' <<SETTINGS)" -c 'colorscheme desert' "$@"
+vim-huge --version | fgrep -q '+cryptv'
+vim-huge -u NONE -c "set $(tr '\n' ' ' <<SETTINGS)" -c 'colorscheme desert' "$@"
   nocompatible
   secure
   viminfo=
@@ -10,7 +10,7 @@ vim -u NONE -c "set $(tr '\n' ' ' <<SETTINGS)" -c 'colorscheme desert' "$@"
   noshelltemp
   nobackup
   nowritebackup
-  cryptmethod=blowfish
+  cryptmethod=blowfish2
   foldmethod=marker
   foldlevel=0
   background=$(cat ~/.theme)