diff --git a/setup/linux/include_x/airootfs/etc/skel/.start_desktop_apps b/setup/linux/include_x/airootfs/etc/skel/.start_desktop_apps
index d4a9abe2..2e33ed8f 100755
--- a/setup/linux/include_x/airootfs/etc/skel/.start_desktop_apps
+++ b/setup/linux/include_x/airootfs/etc/skel/.start_desktop_apps
@@ -3,7 +3,6 @@
 ## Start desktop apps based on WM
 
 # Start common apps
-feh --bg-fill "$HOME/.wallpaper"
 compton --backend xrender --xrender-sync --xrender-sync-fence &
 sleep 1s
 x0vncserver -display :0 -passwordfile $HOME/.vnc/passwd -AlwaysShared &
diff --git a/setup/linux/include_x/airootfs/etc/skel/.update_x b/setup/linux/include_x/airootfs/etc/skel/.update_x
index e8829371..0202750e 100755
--- a/setup/linux/include_x/airootfs/etc/skel/.update_x
+++ b/setup/linux/include_x/airootfs/etc/skel/.update_x
@@ -91,6 +91,11 @@ xset -dpms
 xrdb -merge $HOME/.Xresources
 echo "Done"
 
+# Set wallpaper
+echo -n "Setting wallpaper... "
+feh --bg-fill "$HOME/.wallpaper"
+echo "Done"
+
 # Start desktop apps for i3
 if fgrep -q "i3" /proc/cmdline; then
   i3-msg exec $HOME/.start_desktop_apps