Editor took too long to respond and became unresponsive

Editor took too long to respond and became unresponsive #1380