diff --git a/.config/shell/env b/.config/shell/env
index 73f6d14..3fb5bf1 100644
--- a/.config/shell/env
+++ b/.config/shell/env
@@ -14,12 +14,14 @@ if [ -z "$PROFILE_LOADED" ] && [ -f ~/.profile ]; then
 fi
 
 # Intelligently set $EDITOR
-if command -v nvim > /dev/null;then
-   export EDITOR=nvim
-elif command -v vim > /dev/null;then
-   export EDITOR=vim
-elif command -v vi > /dev/null;then
-   export EDITOR=vi
+if [ "${EDITOR:-}" = "" ] || [ "${EDITOR##*/}" = "nano" ]; then
+   if command -v nvim > /dev/null;then
+      export EDITOR=nvim
+   elif command -v vim > /dev/null;then
+      export EDITOR=vim
+   elif command -v vi > /dev/null;then
+      export EDITOR=vi
+   fi
 fi
 export SYSTEMD_EDITOR="$EDITOR"
 export VISUAL="$EDITOR"