diff --git a/shell/exports.sh b/shell/exports.sh
index c984101..9194d95 100644
--- a/shell/exports.sh
+++ b/shell/exports.sh
@@ -2,9 +2,10 @@ export PATH="/usr/local/mysql/bin/:$PATH"
 export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
 export PATH="$PATH:/usr/local/jruby/bin"
 
-export GEM_OPEN_EDITOR=$EDITOR
-export GIT_EDITOR=$EDITOR
-export VISUAL=$EDITOR
+# Use single quotes here to lazy evaluate the $EDITOR variable
+export GEM_OPEN_EDITOR='$EDITOR'
+export GIT_EDITOR='$EDITOR'
+export VISUAL='$EDITOR'
 
 export IRBRC="$HOME/.irbrc"
 export JEWELER_OPTS="--rspec --gemcutter --rubyforge --reek --roodi"
diff --git a/shell/save-directory.sh b/shell/save-directory.sh
index c59885c..3162819 100644
--- a/shell/save-directory.sh
+++ b/shell/save-directory.sh
@@ -8,4 +8,4 @@ save (){
 	mv ~/.dirs1 ~/.dirs; echo "$@"=\"`pwd`\" >> ~/.dirs
 	source ~/.dirs
 }
-source ~/.dirs  # Initialization for the above 'save' facility: source the .dirs file
+source ~/.dirs  # Initialization for the above 'save' facility: source the .dirs file
\ No newline at end of file