diff --git a/.zshenv b/.zshenv
index b7ca723..4f0f2b0 100644
--- a/.zshenv
+++ b/.zshenv
@@ -20,17 +20,9 @@ export CALIBRE_USE_SYSTEM_THEME=true
 
 export WINEDLLOVERRIDES=winemenubuilder.exe=d
 
-# Add $HOME/.bin to PATH if it exists and is not already in the path
-if [[ -d "$HOME/.bin" ]] && ! grep -q ":$HOME"'/\.bin\(:\|$\)' <<< "$PATH"
-then
-  export PATH="$PATH:$HOME/.bin"
-fi
-
-# Add $HOME/.dotfiles to PATH if it exists and is not already in the path
-if [[ -d "$HOME/.dotfiles" ]] && ! grep -q ":$HOME"'/\.dotfiles\(:\|$\)' <<< "$PATH"
-then
-  export PATH="$PATH:$HOME/.dotfiles"
-fi
+# Don't allow duplicate values in path
+typeset -U path
+path=($HOME/.bin $HOME/.dotfiles/ $path)
 
 # Set temporary files locations
 if [[ ! -d "$TMPDIR" ]]