Fix expanded desktop bug