fix: Apply viewer wrapper as we do it in text

fix: Apply viewer wrapper as we do it in text #664