fix border hightlight issue