diff --git a/.config/shell/env b/.config/shell/env
index 4d831fe..db7cf6f 100644
--- a/.config/shell/env
+++ b/.config/shell/env
@@ -55,13 +55,20 @@ if [ -z "$PROFILE_LOADED" ] && [ -f ~/.profile ]; then
 fi
 
 # Intelligently set $EDITOR
-if [ "${EDITOR:-}" = "" ] || [ "${EDITOR##*/}" = "nano" ]; then
+if [ "${EDITOR:-}" = "" ] ||
+   [ "${EDITOR##*/}" = "nano" ] ||
+   ! command -v "$EDITOR" > /dev/null
+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
+   elif command -v nano > /dev/null; then
+      export EDITOR=nano
+   else
+      echo "Error: couldn't find a valid candidate for \$EDITOR" >&2
    fi
 fi
 export SYSTEMD_EDITOR="$EDITOR"