Use explicit wrapper in editor view as well