Revert "Revert "Try not to point to an unlinked desktop""

This reverts commit 9eb7be13031869505f78f3869ddc5cde36be470f.