diff --git a/oni/home/data/config.scm b/oni/home/data/config.scm
index 6d9df14..56f055b 100644
--- a/oni/home/data/config.scm
+++ b/oni/home/data/config.scm
@@ -56,8 +56,7 @@
              (environment-variables
               '(("HISTFILE" . "$HOME/.zsh/histfile")
                 ("HISTSIZE" . "1000")
-                ("SAVEHIST" . "1000")
-                ("PROMPT" . "%T \\$(spwd) %B%(?.%F{2}.%F{1}[%?])>%b%f ")))
+                ("SAVEHIST" . "1000")))
              (zshrc
               (list
                (mixed-text-file
@@ -70,6 +69,7 @@
                 "alias hc=herbstclient\n"
                 "setopt SHARE_HISTORY\n"
                 "setopt HIST_IGNORE_ALL_DUPS\n"
+                "setopt PROMPT_SUBST\n"
                 "zle -N x-copy-region-as-kill\n"
                 "zle -N x-kill-region\n"
                 "zle -N x-yank\n"
@@ -77,7 +77,8 @@
                 "bindkey -e '^W' x-kill-region\n"
                 "bindkey -e '^Y' x-yank\n"
                 "autoload -Uz compinit\n"
-                "compinit\n")))))
+                "compinit\n"
+                "PROMPT=\"%T \\$(spwd) %B%(?.%F{2}.%F{1}[%?])>%b%f \"")))))
 
    ;; This has to be the first extension because it needs to be added to the
    ;; configuration last.