Filter apply button focus issue fix