Fixed event polling switch in editor state