Fix for a recursion in Desktop class.