diff --git a/demo/collections/RichText.ts b/demo/collections/RichText.ts
index 72d8df5a1d..f79e061b3b 100644
--- a/demo/collections/RichText.ts
+++ b/demo/collections/RichText.ts
@@ -23,7 +23,7 @@ const RichText: CollectionConfig = {
             media: {
               fields: [
                 {
-                  type: 'textarea',
+                  type: 'richText',
                   name: 'caption',
                   label: 'Caption',
                 },
diff --git a/src/admin/components/forms/field-types/RichText/elements/upload/Element/EditModal/index.scss b/src/admin/components/forms/field-types/RichText/elements/upload/Element/EditModal/index.scss
index 325f357c8f..9a3c1f4280 100644
--- a/src/admin/components/forms/field-types/RichText/elements/upload/Element/EditModal/index.scss
+++ b/src/admin/components/forms/field-types/RichText/elements/upload/Element/EditModal/index.scss
@@ -22,4 +22,20 @@
       margin: 0 0 0 $baseline;
     }
   }
+
+  .rich-text__wrap {
+    .field-type-gutter {
+      display: none;
+    }
+  }
+  .rich-text__toolbar {
+    margin-bottom: 0;
+  }
+  .rich-text__editor {
+    background-color: white;
+    border: 1px solid $color-light-gray;
+    border-top: none;
+    min-height: base(5);
+    padding: base(.35) base(.5);
+  }
 }
diff --git a/src/fields/richText/populate.ts b/src/fields/richText/populate.ts
index 37d6f9cc72..154b291588 100644
--- a/src/fields/richText/populate.ts
+++ b/src/fields/richText/populate.ts
@@ -7,6 +7,7 @@ import { PayloadRequest } from '../../express/types';
 type Arguments = {
   data: unknown
   overrideAccess?: boolean
+  key: string | number
   depth: number
   currentDepth?: number
   payload: Payload
@@ -19,6 +20,7 @@ export const populate = async ({
   id,
   collection,
   data,
+  key,
   overrideAccess,
   depth,
   currentDepth,
@@ -30,7 +32,7 @@ export const populate = async ({
   field: Field
   collection: Collection
 }): Promise<void> => {
-  let dataRef = data as Record<string, unknown>;
+  const dataRef = data as Record<string, unknown>;
 
   const doc = await payload.operations.collections.findByID({
     req: {
@@ -47,8 +49,8 @@ export const populate = async ({
   });
 
   if (doc) {
-    dataRef = doc;
+    dataRef[key] = doc;
   } else {
-    dataRef = null;
+    dataRef[key] = null;
   }
 };
diff --git a/src/fields/richText/recurseNestedFields.ts b/src/fields/richText/recurseNestedFields.ts
index accc6e1caf..b3dd326ccb 100644
--- a/src/fields/richText/recurseNestedFields.ts
+++ b/src/fields/richText/recurseNestedFields.ts
@@ -40,7 +40,8 @@ export const recurseNestedFields = ({
                   id: value,
                   field,
                   collection,
-                  data: data[field.name][i],
+                  data: data[field.name],
+                  key: i,
                   overrideAccess,
                   depth,
                   currentDepth,
@@ -58,7 +59,8 @@ export const recurseNestedFields = ({
                   id,
                   field,
                   collection,
-                  data: data[field.name][i],
+                  data: data[field.name],
+                  key: i,
                   overrideAccess,
                   depth,
                   currentDepth,
@@ -75,7 +77,8 @@ export const recurseNestedFields = ({
             id: data[field.name].value,
             field,
             collection,
-            data: data[field.name].value,
+            data: data[field.name],
+            key: 'value',
             overrideAccess,
             depth,
             currentDepth,
@@ -90,7 +93,8 @@ export const recurseNestedFields = ({
           id: data[field.name],
           field,
           collection,
-          data: data[field.name],
+          data,
+          key: field.name,
           overrideAccess,
           depth,
           currentDepth,
diff --git a/src/fields/richText/relationshipPromise.ts b/src/fields/richText/relationshipPromise.ts
index 1a4d34f20c..8d3d963fbe 100644
--- a/src/fields/richText/relationshipPromise.ts
+++ b/src/fields/richText/relationshipPromise.ts
@@ -62,7 +62,8 @@ export const recurseRichText = ({
         promises.push(populate({
           req,
           id: element.value.id,
-          data: element.value,
+          data: element,
+          key: 'value',
           overrideAccess,
           depth,
           currentDepth,
diff --git a/src/fields/tests/richText.spec.ts b/src/fields/tests/richText.spec.ts
new file mode 100644
index 0000000000..e69de29bb2