diff --git a/.config/dtfscripts/wmstartup.sh b/.config/dtfscripts/wmstartup.sh
index b8b8440c..02252e7b 100755
--- a/.config/dtfscripts/wmstartup.sh
+++ b/.config/dtfscripts/wmstartup.sh
@@ -59,26 +59,6 @@ for service in $services; do
 		sleep 0.5
 	done
 done
-# Wallpaper management
-# Note that this MUST happen before the compositor starts, otherwise xsetroot
-# will not apply properly
-wpm=feh
-if which xfdesktop > /dev/null 2>&1; then
-	printf "  [INFO] Starting xfdesktop\n"
-	wpm=xfdesktop
-	xfdesktop --disable-wm-check&
-elif which feh > /dev/null 2>&1; then
-	printf "  [INFO] Setting wallpaper with feh\n"
-	printf "  [WARN] This solution may cause problems on multi-monitor systems\n"
-	feh --randomize --bg-fill ~/Pictures/Wallpapers/.active &
-elif which xsetroot > /dev/null 2>&1; then
-	printf "  [INFO] Setting root window color\n"
-	wpm=xsetroot
-	xsetroot -solid "#282828"
-else
-	wpm=none
-	printf "  [WARN] Could not find any wallpaper manager\n"
-fi
 # Don't start the compositor in a VM
 if [[ $(hostname) != "vm"* ]]; then
 	printf "  [INFO] Starting compton\n"
@@ -99,24 +79,21 @@ printf "[INFO] Starting platform-independent tasks\n"
 printf "  [INFO] Starting dunst\n"
 dunst&
 printf "  [INFO] Starting conky\n"
-if [[ $wpm == "xfdesktop" ]]; then
-	printf "    [INFO] Waiting for xfdesktop to initialize\n"
-	if which xdotool > /dev/null 2>&1; then
-		i=0
-		until xdotool search --class "xfdesktop"; do
-			i=$(expr $i + 1)
-			if [[ $i -ge 10 ]]; then
-				printf "      [WARN] Grew too impatient!\n"
-				break
-			fi
-			sleep 1
-		done
-		unset i
-	else
-		printf "      [WARN] Could not find xdotool!\n"
-	fi
-	printf "    [INFO] Finished waiting\n"
-fi
 conky&
+# Wallpaper management
+printf "  [INFO] Setting wallpaper\n"
+if which xfdesktop > /dev/null 2>&1; then
+	printf "    [INFO] Starting xfdesktop\n"
+	xfdesktop --disable-wm-check&
+elif which feh > /dev/null 2>&1; then
+	printf "    [INFO] Setting wallpaper with feh\n"
+	printf "    [WARN] This solution may cause problems on multi-monitor systems\n"
+	feh --randomize --bg-fill ~/Pictures/Wallpapers/.active &
+elif which xsetroot > /dev/null 2>&1; then
+	printf "    [INFO] Setting root window color\n"
+	xsetroot -solid "#282828"
+else
+	printf "    [WARN] Could not find any wallpaper manager\n"
+fi
 printf "[INFO] Finished initialization\n"