diff --git a/includes/bash_aliases.bash b/includes/bash_aliases.bash
index c3073b6..eaa13db 100644
--- a/includes/bash_aliases.bash
+++ b/includes/bash_aliases.bash
@@ -16,7 +16,7 @@ alias pjf="cd ~/Dropbox/Projects/_Forks"
 alias pjm="cd ~/Dropbox/Projects/!"
 alias o="open"
 alias oo="open ."
-alias e="subl"
+alias e=$EDITOR
 alias gh="github"
 alias +x="chmod +x"
 alias x+="chmod +x"
diff --git a/tilde/bash_profile.bash b/tilde/bash_profile.bash
index e7372a4..f298e03 100644
--- a/tilde/bash_profile.bash
+++ b/tilde/bash_profile.bash
@@ -63,6 +63,9 @@ UNDERLINE="$(tput sgr 0 1)"
 INVERT="$(tput sgr 1 0)"
 NOCOLOR="$(tput sgr0)"
 
+# vim is default editor
+export EDITOR=`which vim`
+
 # Load prompt and aliases
 for file in ~/dotfiles/includes/bash_{prompt,aliases,functions,git}.bash; do
 	[ -r "$file" ] && source "$file"
@@ -97,9 +100,6 @@ function _tamia_autocomplete() {
 }
 command -v yo >/dev/null 2>&1 && complete -F _tamia_autocomplete tm
 
-# Nano is default editor
-export EDITOR='nano'
-
 # Tell ls to be colourful
 export CLICOLOR=1