Fix Bug 944804 - Editor doesn't close if trackevent being editor was removed.
review fixes