Fix a focus issue