Fix jumping focus issue