Updated to scroll to highlighted text (if applicable)