diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index 86799bc616..06970dc44b 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -180,7 +180,7 @@ watch(editorDom, () => {
     <EditorContent
       ref="editorDom"
       :editor="editor"
-      class="flex flex-col nc-textarea-rich-editor w-full"
+      class="flex flex-col nc-textarea-rich-editor w-full overflow-hidden"
       :class="{
         'ml-1 mt-2.5 flex-grow': props.fullMode,
         'nc-scrollbar-md': (!props.fullMode && !props.readonly) || isExpandedFormOpen,
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index 7414851a39..a0daa8aafe 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -178,8 +178,8 @@ watch(editEnabled, () => {
         v-if="isRichMode"
         class="w-full cursor-pointer"
         :style="{
-          maxHeight: `${height}px !important`,
-          minHeight: `${height}px !important`,
+          maxHeight: isExpandedFormOpen ? `${height}px !important` : `${25 * (rowHeight || 1)}px !important`,
+          minHeight: isExpandedFormOpen ? `${height}px !important` : `${25 * (rowHeight || 1)}px !important`,
         }"
         @dblclick="onExpand"
         @keydown.enter="onExpand"