Fix situations where the same event that triggered edit can also trigger save