diff --git a/apps/console/src/pages/organizations/documents/DocumentLayout.tsx b/apps/console/src/pages/organizations/documents/DocumentLayout.tsx
index 6ac375eb7..a17487483 100644
--- a/apps/console/src/pages/organizations/documents/DocumentLayout.tsx
+++ b/apps/console/src/pages/organizations/documents/DocumentLayout.tsx
@@ -150,7 +150,7 @@ export function DocumentLayout(props: { queryRef: PreloadedQuery<DocumentLayoutQ
 
   return (
     <>
-      <div className="space-y-6">
+      <div className="flex flex-col gap-6 h-full">
         <div className="flex justify-between items-center mb-4">
           <Breadcrumb
             items={[
diff --git a/apps/console/src/pages/organizations/documents/description/DocumentDescriptionPage.tsx b/apps/console/src/pages/organizations/documents/description/DocumentDescriptionPage.tsx
index fe07586ab..7e672894c 100644
--- a/apps/console/src/pages/organizations/documents/description/DocumentDescriptionPage.tsx
+++ b/apps/console/src/pages/organizations/documents/description/DocumentDescriptionPage.tsx
@@ -117,13 +117,11 @@ export function DocumentDescriptionPage(props: { queryRef: PreloadedQuery<Docume
   );
 
   return (
-    <div>
-      <RichEditor
-        content={currentVersion.content}
-        disabled={currentVersion.status !== "DRAFT"}
-        onChange={handleUpdate}
-      />
-      {/* <Markdown content={currentVersion.content} /> */}
-    </div>
+    <RichEditor
+      className="flex-1"
+      content={currentVersion.content}
+      disabled={currentVersion.status !== "DRAFT"}
+      onChangeContent={handleUpdate}
+    />
   );
 }
diff --git a/packages/ui/src/Layouts/Layout.tsx b/packages/ui/src/Layouts/Layout.tsx
index 293ecd21e..55d2037cc 100644
--- a/packages/ui/src/Layouts/Layout.tsx
+++ b/packages/ui/src/Layouts/Layout.tsx
@@ -81,11 +81,11 @@ export function Layout({
           {sidebar && <Sidebar>{sidebar}</Sidebar>}
           <main
             className={clsx(
-              "overflow-y-auto w-full mt-12 transition-all duration-300",
+              "overflow-y-auto w-full mt-12 transition-all duration-300 h-[calc(100vh-48px)]",
               hasDrawer && "pr-105",
             )}
           >
-            <div className="py-12 px-8 max-w-[1200px] w-full mx-auto">
+            <div className="py-12 px-8 max-w-[1200px] w-full mx-auto h-full">
               {children}
             </div>
           </main>
diff --git a/packages/ui/src/RichEditor/RichEditor.tsx b/packages/ui/src/RichEditor/RichEditor.tsx
index 4471bc86c..d4ba31d61 100644
--- a/packages/ui/src/RichEditor/RichEditor.tsx
+++ b/packages/ui/src/RichEditor/RichEditor.tsx
@@ -16,7 +16,7 @@ import { Underline } from "@tiptap/extension-underline";
 import { Dropcursor, Gapcursor, UndoRedo } from "@tiptap/extensions";
 import { type Content, EditorContent, useEditor, useEditorState } from "@tiptap/react";
 import { BubbleMenu, FloatingMenu } from "@tiptap/react/menus";
-import { useEffect } from "react";
+import { type ComponentProps, useEffect } from "react";
 import { tv } from "tailwind-variants";
 
 const extensions = [
@@ -47,6 +47,7 @@ const richEditorVariants = tv({
     bubbleMenu: ["flex items-center gap-1 rounded-lg border border-border-mid bg-level-0 p-1 shadow-md"],
     floatingMenu: ["flex items-center gap-1 rounded-lg border border-border-mid bg-level-0 p-1 shadow-md"],
     menuButton: ["px-2 py-1 text-sm rounded-sm font-semibold bg-level-0 hover:bg-subtle"],
+    editor: ["h-full"],
   },
   variants: {
     active: {
@@ -57,7 +58,7 @@ const richEditorVariants = tv({
   },
 });
 
-const { bubbleMenu, floatingMenu, menuButton } = richEditorVariants();
+const { bubbleMenu, floatingMenu, editor: editorVariants, menuButton } = richEditorVariants();
 
 type MenuButtonProps = {
   label: string;
@@ -77,16 +78,21 @@ function MenuButton({ label, active, onClick }: MenuButtonProps) {
   );
 }
 
-interface RichEditorProps {
+type RichEditorProps = ComponentProps<"div"> & {
   content: string;
   disabled?: boolean;
-  onChange: (content: string) => void;
-}
+  onChangeContent: (content: string) => void;
+};
 
 export function RichEditor(props: RichEditorProps) {
-  const { content, disabled = false, onChange } = props;
+  const { className, content, disabled = false, onChangeContent } = props;
 
   const editor = useEditor({
+    editorProps: {
+      attributes: {
+        class: "h-full",
+      },
+    },
     editable: !disabled,
     extensions,
     content: (content ? JSON.parse(content) : "") as Content,
@@ -101,12 +107,12 @@ export function RichEditor(props: RichEditorProps) {
 
   useEffect(() => {
     if (watchedContent !== content) {
-      onChange(watchedContent);
+      onChangeContent(watchedContent);
     }
-  }, [content, watchedContent, onChange]);
+  }, [content, watchedContent, onChangeContent]);
 
   return (
-    <div>
+    <div className={editorVariants({ className })}>
       <BubbleMenu
         editor={editor}
         className={bubbleMenu()}
@@ -200,7 +206,7 @@ export function RichEditor(props: RichEditorProps) {
         />
       </FloatingMenu>
 
-      <EditorContent editor={editor} />
+      <EditorContent className={editorVariants()} editor={editor} />
     </div>
   );
 }