dev/core#2102 Fix hang on event edit