Expanded desktop mode bug fix