diff --git a/home/.chezmoiscripts/universal/run_onchange_after_06-configure-root-folder.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_06-configure-root-folder.sh.tmpl
index ae0539ba..1f415068 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_06-configure-root-folder.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_06-configure-root-folder.sh.tmpl
@@ -25,7 +25,7 @@ if [ -n "$ROOT_FOLDER" ]; then
     logg info "Copying ~/.bashrc to $ROOT_FOLDER/.bashrc" && sudo cp -f "$HOME/.bashrc" "$ROOT_FOLDER/.bashrc"
     logg info "Copying ~/.zshrc to $ROOT_FOLDER/.zshrc" && sudo cp -f "$HOME/.zshrc" "$ROOT_FOLDER/.zshrc"
     logg info "Ensuring ~/.config folder exists" && sudo mkdir -p "$ROOT_FOLDER/.config"
-    logg info "Copying ~/.config/shell to $ROOT_FOLDER/.config/shell" && sudo rm -rf "$HOME/.config/shell" && sudo cp -rf "$HOME/.config/shell" "$ROOT_FOLDER/.config/shell"
+    logg info "Copying ~/.config/shell to $ROOT_FOLDER/.config/shell" && sudo mkdir -p "$ROOT_FOLDER/.config" && sudo rm -rf "$ROOT_FOLDER/.config/shell" && sudo cp -rf "$HOME/.config/shell" "$ROOT_FOLDER/.config/shell"
 fi
 
 {{ end -}}
diff --git a/home/dot_zshrc b/home/dot_zshrc
index ebae1548..1effce73 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@@ -25,7 +25,8 @@ case $- in
 esac
 
 ### Misc.
-export HISTFILE="$XDG_STATE_HOME/zsh/history"
+[ -d "${XDG_STATE_HOME:-$HOME/.local/state}/zsh" ] || mkdir -p "${XDG_STATE_HOME:-$HOME/.local/state}/zsh"
+export HISTFILE="${XDG_STATE_HOME:-$HOME/.local/state}/zsh/history"
 export ZLE_RPROMPT_INDENT=0
 export WORDCHARS=${WORDCHARS//\/}
 export PROMPT_EOL_MARK=