fix focus logic again