Fix #7586 - more events for editor