diff --git a/packages/ui/components/editor/Editor.tsx b/packages/ui/components/editor/Editor.tsx
index d66cdeeb96..cd2ffec8ee 100644
--- a/packages/ui/components/editor/Editor.tsx
+++ b/packages/ui/components/editor/Editor.tsx
@@ -2,7 +2,6 @@ import { CodeHighlightNode, CodeNode } from "@lexical/code";
 import { AutoLinkNode, LinkNode } from "@lexical/link";
 import { ListItemNode, ListNode } from "@lexical/list";
 import { TRANSFORMERS } from "@lexical/markdown";
-import { AutoFocusPlugin } from "@lexical/react/LexicalAutoFocusPlugin";
 import { LexicalComposer } from "@lexical/react/LexicalComposer";
 import { ContentEditable } from "@lexical/react/LexicalContentEditable";
 import { LinkPlugin } from "@lexical/react/LexicalLinkPlugin";
@@ -71,7 +70,6 @@ export const Editor = (props: TextEditorProps) => {
               contentEditable={<ContentEditable style={{ height: props.height }} className="editor-input" />}
               placeholder={<div className="-mt-11 p-3 text-sm text-gray-300">{props.placeholder || ""}</div>}
             />
-            <AutoFocusPlugin />
             <ListPlugin />
             <LinkPlugin />
             <AutoLinkPlugin />
diff --git a/packages/ui/components/editor/plugins/ToolbarPlugin.tsx b/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
index d265e858c9..1c4fe0eb9b 100644
--- a/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
+++ b/packages/ui/components/editor/plugins/ToolbarPlugin.tsx
@@ -349,11 +349,12 @@ export default function ToolbarPlugin(props: TextEditorProps) {
       $getRoot().select();
       $insertNodes(nodes);
 
-      editor.registerUpdateListener(({ editorState }) => {
+      editor.registerUpdateListener(({ editorState, prevEditorState }) => {
         editorState.read(() => {
           const textInHtml = $generateHtmlFromNodes(editor);
           props.setText(textInHtml);
         });
+        if (!prevEditorState._selection) editor.blur();
       });
     });
   }, []);