Apply fix from #147 & #116, un-lazyload editor.