Fix highlighting update while editing