diff --git a/scripts/copy_and_link b/scripts/copy_and_link
index b9aa629..dac3890 100755
--- a/scripts/copy_and_link
+++ b/scripts/copy_and_link
@@ -16,7 +16,7 @@ printf "\n\nInstalling Scripts..."
 cd ../
 
 if [ ! -d "$HOME/.local/bin" ]; then
-    mkdir "$HOME/.local/bin"
+    mkdir -p "$HOME/.local/bin"
 fi
 
 cp -rb bin "$HOME"/.local
diff --git a/setup b/setup
index e72590e..e6b1384 100755
--- a/setup
+++ b/setup
@@ -118,18 +118,14 @@ cd "$HOME"/.doors &&
 "$HOME"/.doors/scripts/copy_and_link "$input"
 
 # Copy default wallpaper
-if ! test -d "$HOME"/Pictures; then
-    mkdir "$HOME"/Pictures
-fi
-
-if ! test -d "$HOME"/Pictures/Wallpapers; then
-    mkdir "$HOME"/Pictures/Wallpapers
-fi
 
 if ! test -f "$HOME"/Pictures/Wallpapers/door2.jpg; then
+    if ! test -d "$HOME"/Pictures/Wallpapers; then
+        mkdir -p "$HOME"/Pictures/Wallpapers
     printf "Downloading default wallpaper...\n"
     curl -so "$HOME"/Pictures/Wallpapers/door2.jpg https://old.doordesk.net/door2.jpg &&
     wal -ensqi "$HOME"/Pictures/Wallpapers
+    fi
 fi
 
 # Wrap up