diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue
index 054f29ca31..c9a73f0cf2 100644
--- a/packages/nc-gui/components/cell/RichText.vue
+++ b/packages/nc-gui/components/cell/RichText.vue
@@ -19,6 +19,8 @@ const props = defineProps<{
 
 const emits = defineEmits(['update:value'])
 
+const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false))!
+
 const turndownService = new TurndownService({})
 
 turndownService.addRule('lineBreak', {
@@ -171,7 +173,8 @@ watch(editorDom, () => {
       class="flex flex-col nc-textarea-rich-editor w-full"
       :class="{
         'ml-1 mt-2.5 flex-grow': props.fullMode,
-        'nc-scrollbar-md': !props.fullMode && !props.readonly,
+        'nc-scrollbar-md': (!props.fullMode && !props.readonly) || isExpandedFormOpen,
+        'flex-grow': isExpandedFormOpen,
       }"
     />
   </div>
diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue
index ab815cd3d8..a1cc284f0e 100644
--- a/packages/nc-gui/components/cell/TextArea.vue
+++ b/packages/nc-gui/components/cell/TextArea.vue
@@ -58,6 +58,8 @@ const isDragging = ref(false)
 const focus: VNodeRef = (el) => !isExpandedFormOpen.value && !isEditColumn.value && (el as HTMLTextAreaElement)?.focus()
 
 const height = computed(() => {
+  if (isExpandedFormOpen.value) return 36 * 4
+
   if (!rowHeight.value || rowHeight.value === 1) return 36
 
   return rowHeight.value * 36
@@ -169,7 +171,7 @@ watch(editEnabled, () => {
 <template>
   <NcDropdown
     v-model:visible="isVisible"
-    class="overflow-visible"
+    class="overflow-hidden"
     :trigger="[]"
     placement="bottomLeft"
     :overlay-class-name="isVisible ? 'nc-textarea-dropdown-active' : undefined"
@@ -177,8 +179,8 @@ watch(editEnabled, () => {
     <div
       class="flex flex-row pt-0.5 w-full rich-wrapper"
       :class="{
-        'min-h-10': rowHeight !== 1,
-        'min-h-6.5': rowHeight === 1,
+        'min-h-10': rowHeight !== 1 || isExpandedFormOpen,
+        'min-h-6.5': rowHeight === 1 && !isExpandedFormOpen,
         'h-full': isForm,
       }"
     >
@@ -198,7 +200,7 @@ watch(editEnabled, () => {
         :ref="focus"
         v-model="vModel"
         rows="4"
-        class="h-full w-full outline-none border-none"
+        class="h-full w-full outline-none border-none nc-scrollbar-md"
         :class="{
           'p-2': editEnabled,
           'py-1 h-full': isForm,