BHV-9064: Fix focus state on active button
Merge pull request #1350 from enyojs/BHV-9064-jeremythomas

BHV-9064: Fix focus state on active button