Fixed weird toggle highlight issue