Methods and systems are provided for mitigating engine pre-ignition based on a feed-forward likelihood of pre-ignition and feedback from a pre-ignition event. In response to an indication of pre-ignition, a cylinder may be enriched while an engine load is limited. The enrichment may be followed by an enleanment to restore exhaust catalyst feed-gas oxygen levels. The mitigating steps may be adjusted based on engine operating conditions, a pre-ignition count, as well as the nature of the pre-ignition.