Fixing case where style changes on an Expandable item