Fixed highlight bug with sidebar