Finally fix expanded desktop mode