diff --git a/.zshenv b/.zshenv
index cbfde1c..7f73b9a 100644
--- a/.zshenv
+++ b/.zshenv
@@ -1,6 +1,8 @@
 #-*- mode: sh; -*-
 
 # Environment variables
+export EDITOR="emacsclient -t"
+export VISUAL="emacsclient -c -n"
 export ARDUINO_DIR="/usr/share/arduino"
 export ARDMK_DIR="$HOME/Programs/Arduino-Makefile"
 export STEAMAPPS="$HOME/.local/share/Steam/steamapps/common"