Add a wait condition to prevent playlist highlight being messed up