Update: fix empty desktop handling