Fix note highlight being lost after real time update

Closes #33483

See merge request !12098