Fix compose popup update of fields