Fix remain highlight after editing