diff --git a/tools/install.sh b/tools/install.sh
index 3f4de868..0963e620 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -110,7 +110,12 @@ main() {
   echo 'p.p.s. Get stickers and t-shirts at http://shop.planetargon.com.'
   echo ''
   printf "${NORMAL}"
-  env zsh
+
+  # Check if the user wants to switch into zsh right after the installation
+  # (! $1 = "--no-env-zsh")
+  if [ ! $1 = "--no-env-zsh" ]; then
+    env zsh
+  fi
 }
 
 main