diff --git a/zsh/func/init-env b/zsh/func/init-env
index ca30c67..37994f4 100644
--- a/zsh/func/init-env
+++ b/zsh/func/init-env
@@ -5,8 +5,6 @@ autoload -Uz binary_exists
 function init-env
 {
     export PAGER=less
-    export VISUAL=$EDITOR
-    export LESSHISTFILE="-"
     export GREP_OPTIONS="--color=auto"
     export GREP_COLOR="1;32"
 
diff --git a/zsh/func/init-env-vi b/zsh/func/init-env-vi
index ed724d1..442fc3a 100644
--- a/zsh/func/init-env-vi
+++ b/zsh/func/init-env-vi
@@ -13,6 +13,8 @@ function init-env-vi
     else
         export EDITOR=vi
     fi
+
+    export VISUAL=$EDITOR
 }
 
 init-env-vi "$@"