BHV-9064: Fix focus state on active button