diff --git a/react/src/components/AtomForm/Field.js b/react/src/components/AtomForm/Field.js
index 0b2b40c988..fb316abdba 100644
--- a/react/src/components/AtomForm/Field.js
+++ b/react/src/components/AtomForm/Field.js
@@ -35,6 +35,7 @@ class Field extends React.PureComponent {
     const { atom, field, index, onChange, onValueChange, startSplittingAtom } = this.props
     const { meta } = atom.record
     const isCheck = meta.structure[field] && meta.structure[field].type === 'boolean'
+    const atomKey = atom.record.id || atom.record.lodashId
 
     return (
       <div
@@ -48,7 +49,7 @@ class Field extends React.PureComponent {
         >
           {isCheck && (
             <AtomInput
-              key={field}
+              key={`${atomKey}-${field}`}
               field={field}
               atom={atom}
               index={index}
@@ -62,7 +63,7 @@ class Field extends React.PureComponent {
 
         {!isCheck && (
           <AtomInput
-            key={field}
+            key={`${atomKey}-${field}`}
             field={field}
             atom={atom}
             index={index}
diff --git a/react/src/components/AtomForm/Fields.js b/react/src/components/AtomForm/Fields.js
index d492b7042a..f03b66ecea 100644
--- a/react/src/components/AtomForm/Fields.js
+++ b/react/src/components/AtomForm/Fields.js
@@ -3,13 +3,15 @@ import React from 'react'
 import Field from './Field'
 
 export default function Fields ({ atom, index, onChange, onValueChange, startSplittingAtom }) {
+  const atomKey = atom.record.id || atom.record.lodashId
+  
   return (
     <React.Fragment>
       {Object.keys(atom.record.meta.structure).map((field) => (
         <Field
           atom={atom}
           field={field}
-          key={field}
+          key={`${atomKey}-${field}`}
           index={index}
           onChange={onChange}
           onValueChange={onValueChange}
diff --git a/react/src/components/AtomForm/index.js b/react/src/components/AtomForm/index.js
index dee6344627..fe8df59e8d 100644
--- a/react/src/components/AtomForm/index.js
+++ b/react/src/components/AtomForm/index.js
@@ -245,6 +245,7 @@ class AtomForm extends React.PureComponent {
           {this.props.form.atoms.map((atom, index) => {
             const asMolecule = molecule && !atom.record.meta.molecule_singleton
             if (asMolecule) { nonSingletonIndex++ }
+            const atomKey = atom.record.id || atom.record.lodashId
 
             const fillOutput = (input) => {
               let zIndex = 100
@@ -306,7 +307,7 @@ class AtomForm extends React.PureComponent {
                   return (
                     <Associations
                       atom={atom}
-                      key={input}
+                      key={`${atomKey}-${input}`}
                       asyncData={asMolecule ? asyncData : undefined}
                       onChange={this.onAssociationChange}
                       onBlur={() => { this.setState({ focusedIndex: null }) }}
@@ -319,7 +320,7 @@ class AtomForm extends React.PureComponent {
                 } else if (input === 'STRUCTURE') {
                   return (
                     <Fields
-                      key={input}
+                      key={`${atomKey}-${input}`}
                       atom={atom}
                       onChange={this.onChange}
                       onValueChange={this.onValueChange}
@@ -331,7 +332,7 @@ class AtomForm extends React.PureComponent {
                 } else if (input === 'ATTACHMENTS') {
                   return (
                     <SingleAttachments
-                      key={input}
+                      key={`${atomKey}-${input}`}
                       attachments={atom.record.meta.attachments}
                       atom={atom.record}
                       index={index}
@@ -343,7 +344,7 @@ class AtomForm extends React.PureComponent {
                 } else if (input.indexOf('STRUCTURE/') !== -1) {
                   return (
                     <Field
-                      key={input}
+                      key={`${atomKey}-${input}`}
                       atom={atom}
                       field={input.replace('STRUCTURE/', '')}
                       onChange={this.onChange}
diff --git a/react/src/components/RichTextEditor/index.js b/react/src/components/RichTextEditor/index.js
index a675cec7ab..205e040aec 100644
--- a/react/src/components/RichTextEditor/index.js
+++ b/react/src/components/RichTextEditor/index.js
@@ -11,7 +11,7 @@ class RichTextEditor extends React.PureComponent {
     if (window.folioConsoleInitRedactor) {
       window.folioConsoleInitRedactor(this.editorRef.current, {}, {
         callbacks: {
-          changed: this.props.onChange
+          changed: (html) => this.props.onChange(html)
         },
         scrollTarget: this.props.scrollTarget
       })