diff --git a/.bashrc b/.bashrc
index 8bf0a77..0df02b4 100644
--- a/.bashrc
+++ b/.bashrc
@@ -66,4 +66,7 @@ fi
 #eval `keychain --eval --timeout 10 --quiet --agents ssh id_rsa`
 
 # Default editor
-export EDITOR="emacs -nw"
+export ALTERNATE_EDITOR=""
+export EDITOR="emacsclient -t"          # $EDITOR should open in terminal
+export VISUAL="emacsclient -c -a emacs" # $VISUAL opens in GUI with non-daemon as alternate
+
diff --git a/.zshrc b/.zshrc
index 839d8ea..51c1f36 100644
--- a/.zshrc
+++ b/.zshrc
@@ -99,4 +99,6 @@ fi
 #eval `keychain --eval --timeout 10 --quiet --agents ssh id_rsa`
 
 # Default editor
-export EDITOR="emacs -nw"
+export ALTERNATE_EDITOR=""
+export EDITOR="emacsclient -t"          # $EDITOR should open in terminal
+export VISUAL="emacsclient -c -a emacs" # $VISUAL opens in GUI with non-daemon as alternate