diff --git a/bin/pyenv-sh-deactivate b/bin/pyenv-sh-deactivate
index 506f885..cde4b08 100755
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -33,17 +33,20 @@ fi
 
 case "$shell" in
 fish )
-  echo "  setenv PYENV_DEACTIVATE \"\$VIRTUAL_ENV\";"
+  cat <<EOS
+  setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
+  deactivate;
+else;
+EOS
   ;;
 *    )
-  echo "  export PYENV_DEACTIVATE=\"\$VIRTUAL_ENV\";"
-  ;;
-esac
-
-cat <<EOS
+  cat <<EOS
+  export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
   deactivate;
 else
 EOS
+  ;;
+esac
 
 if [ -z "$QUIET" ]; then
   echo "  echo \"pyenv-virtualenv: no virtualenv has been activated.\" 1>&2;"
diff --git a/test/deactivate.bats b/test/deactivate.bats
index b87386d..6886005 100644
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -84,7 +84,7 @@ EOS
 if functions -q deactivate
   setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
   deactivate;
-else
+else;
   echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
   false;
 end;
@@ -101,7 +101,7 @@ EOS
 if functions -q deactivate
   setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
   deactivate;
-else
+else;
   false;
 end;
 EOS
@@ -118,7 +118,7 @@ if functions -q deactivate
   pyenv shell --unset;
   setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
   deactivate;
-else
+else;
   echo "pyenv-virtualenv: no virtualenv has been activated." 1>&2;
   false;
 end;
@@ -136,7 +136,7 @@ if functions -q deactivate
   pyenv shell --unset;
   setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
   deactivate;
-else
+else;
   false;
 end;
 EOS