Fixed focus not correctly updating.