Fix toolbar highlighting bug.