[#4] Fixed focus problem