Fix highlighting on click