CMS-2592 Forms - On focus highlight