diff --git a/template/bash_profile.template.bash b/template/bash_profile.template.bash
index 95f481e9..6d5fd4fb 100644
--- a/template/bash_profile.template.bash
+++ b/template/bash_profile.template.bash
@@ -17,8 +17,8 @@ export BASH_THEME='bobby'
 export GIT_HOSTING='git@git.domain.com'
 
 # Set my editor and git editor
-export EDITOR="/usr/bin/mate -w"
-export GIT_EDITOR='/usr/bin/mate -w'
+export EDITOR="/usr/local/bin/emacsclient"
+export GIT_EDITOR='/usr/local/bin/emacsclient'
 
 # Set the path nginx
 export NGINX_PATH='/opt/nginx'