Fix rows highlighting after refresh

fixes #6705