More fix for ExpandedDesktop