diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh
index bd0cf6ffe..c7dc42b62 100644
--- a/lib/termsupport.zsh
+++ b/lib/termsupport.zsh
@@ -30,6 +30,9 @@ function omz_termsupport_precmd {
 
 # Runs before executing the command
 function omz_termsupport_preexec {
+  if [[ "$DISABLE_CMD_AUTO_TITLE" == "true" ]]; then
+    return
+  fi
   emulate -L zsh
   setopt extended_glob
 
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 763288dfd..b71c18a1e 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -19,9 +19,12 @@ ZSH_THEME="robbyrussell"
 # Uncomment the following line to disable colors in ls.
 # DISABLE_LS_COLORS="true"
 
-# Uncomment the following line to disable auto-setting terminal title.
+# Uncomment the following line to disable auto-setting terminal title in any way.
 # DISABLE_AUTO_TITLE="true"
 
+# Uncomment the following line to disable auto-setting running commands in the terminal title.
+# DISABLE_CMD_AUTO_TITLE="true"
+
 # Uncomment the following line to enable command auto-correction.
 # ENABLE_CORRECTION="true"