diff --git a/emacs/.emacs.d/config/init-vterm.el b/emacs/.emacs.d/config/init-vterm.el
index 36fd76e..9604f2a 100644
--- a/emacs/.emacs.d/config/init-vterm.el
+++ b/emacs/.emacs.d/config/init-vterm.el
@@ -28,6 +28,7 @@
   (vterm-max-scrollback 10000)
   (vterm-environment '("TYPEWRITTEN_CURSOR=terminal"))
   (vterm-ignore-blink-cursor t)
+  (vterm-clear-scrollback-when-clearing t)
   (vterm-eval-cmds '(("find-file" find-file)
                      ("ff" find-file)
                      ("message" message)
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 5259ea9..daf92a7 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -164,6 +164,8 @@ fi
 # This is to change the title of the buffer based on information provided by the
 # shell. See, http://tldp.org/HOWTO/Xterm-Title-4.html, for the meaning of the
 # various symbols.
+#
+# To actually use this in emacs, customize the variable vterm-buffer-name-string
 autoload -U add-zsh-hook
 add-zsh-hook -Uz chpwd (){ print -Pn "\e]2;%m:%2~\a" }
 
@@ -178,5 +180,6 @@ vterm_prompt_end() {
 }
 setopt PROMPT_SUBST
 PROMPT=$PROMPT'%{$(vterm_prompt_end)%}'
+[[ -z "$tw_prompt" ]] || tw_prompt=$tw_prompt'%{$(vterm_prompt_end)%}'
 
 [[ -f "$HOME/.zshrc-spotify" ]] && source "$HOME/.zshrc-spotify"