More robust fix for edit highlighting in Serial Control View