diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 87e50e39..f935946e 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -122,14 +122,7 @@ export class Editor extends EventEmitter {
     this.registerCommands(coreCommands)
     this.injectCSS()
 
-    // TODO: The autoFocus option has no impact
-    // Doesn’t work
-    this.proxy.focus(this.options.autoFocus)
-    // Does work
-    // window.setTimeout(() => {
-    //   console.log(this.options.autoFocus)
-    //   this.proxy.focus(this.options.autoFocus)
-    // }, 100)
+    window.setTimeout(() => this.proxy.focus(this.options.autoFocus), 0)
   }
 
   /**