diff --git a/src/components/posts/editor/HtmlEditor.tsx b/src/components/posts/editor/HtmlEditor.tsx
index 943068ef8..5b85fa2b9 100644
--- a/src/components/posts/editor/HtmlEditor.tsx
+++ b/src/components/posts/editor/HtmlEditor.tsx
@@ -8,6 +8,7 @@ export interface HTMLEditorProps {
   saveBodyDraft?: (body: string) => void
   className?: string
   showToolbar?: boolean
+  autoFocus?: boolean
 }
 
 export default function HtmlEditor({
@@ -16,13 +17,14 @@ export default function HtmlEditor({
   saveBodyDraft,
   className,
   showToolbar,
+  autoFocus,
 }: HTMLEditorProps) {
   const editor = useCreateEditor(onChange, value, saveBodyDraft)
 
   return (
     <>
       {showToolbar && <ToolBar editor={editor} />}
-      <EditorContent tabIndex={0} className={className} editor={editor} />
+      <EditorContent autoFocus tabIndex={0} className={className} editor={editor} />
     </>
   )
 }
diff --git a/src/components/posts/editor/ModalEditor.tsx b/src/components/posts/editor/ModalEditor.tsx
index 731bdc078..3e0b555f9 100644
--- a/src/components/posts/editor/ModalEditor.tsx
+++ b/src/components/posts/editor/ModalEditor.tsx
@@ -189,7 +189,11 @@ export const PostEditorModalBody = ({
       <SpaceSelector />
       <Form.Item name={fieldName('body')} className='my-3'>
         {/* value and onChange are provided by Form.Item */}
-        <HtmlEditor saveBodyDraft={saveDraft} className={clsx(styles.FastEditor, 'ant-input')} />
+        <HtmlEditor
+          autoFocus
+          saveBodyDraft={saveDraft}
+          className={clsx(styles.FastEditor, 'ant-input')}
+        />
       </Form.Item>
       {imgUrl && (
         <PreviewUploadedImage