Fix to two-box focus