diff --git a/demo/index.html b/demo/index.html
index 613c17016..a78562ad6 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -5,8 +5,8 @@
     </head>
     <body>
         <div id='root'></div>
-        <script src='https://unpkg.com/react@16.8.6/umd/react.production.min.js'></script>
-        <script src='https://unpkg.com/react-dom@16.8.6/umd/react-dom.production.min.js'></script>
+        <script src='https://unpkg.com/react@16.8.6/umd/react.development.js'></script>
+        <script src='https://unpkg.com/react-dom@16.8.6/umd/react-dom.development.js'></script>
 
         <script src="./demo.js"></script>
     </body>
diff --git a/src/dash-table/components/ControlledTable/index.tsx b/src/dash-table/components/ControlledTable/index.tsx
index 67611e64d..c56bc2cc9 100644
--- a/src/dash-table/components/ControlledTable/index.tsx
+++ b/src/dash-table/components/ControlledTable/index.tsx
@@ -859,7 +859,7 @@ export default class ControlledTable extends PureComponent<ControlledTableProps>
                     >
                         {arrayMap3(row, gridStyle[rowIndex], fragmentClasses[rowIndex], (g, s, c, columnIndex) => (<div
                             style={s.fragment}
-                            key={columnIndex}
+                            key={`row--${rowIndex}--column--${columnIndex}`}
                             ref={`r${rowIndex}c${columnIndex}`}
                             className={`cell cell-${rowIndex}-${columnIndex} ${c}`}
                         >
diff --git a/src/dash-table/derived/cell/contents.tsx b/src/dash-table/derived/cell/contents.tsx
index f0a5cb591..f756e311a 100644
--- a/src/dash-table/derived/cell/contents.tsx
+++ b/src/dash-table/derived/cell/contents.tsx
@@ -143,7 +143,7 @@ class Contents {
         switch (cellType) {
             case CellType.Dropdown:
                 return (<CellDropdown
-                    key={`column-${columnIndex}`}
+                    key={`dp-row-${rowIndex}-column-${columnIndex}`}
                     active={active}
                     applyFocus={applyFocus}
                     clearable={dropdown && dropdown.clearable}
@@ -154,7 +154,7 @@ class Contents {
                 />);
             case CellType.Input:
                 return (<CellInput
-                    key={`column-${columnIndex}`}
+                    key={`ci-row-${rowIndex}-column-${columnIndex}`}
                     active={active}
                     applyFocus={applyFocus}
                     className={className}
@@ -167,6 +167,7 @@ class Contents {
                 />);
             case CellType.Markdown:
                 return (<CellMarkdown
+                    key={`cm-row-${rowIndex}-column-${columnIndex}`}
                     active={active}
                     applyFocus={applyFocus}
                     className={className}
@@ -183,7 +184,7 @@ class Contents {
                     active={active}
                     applyFocus={applyFocus}
                     className={className}
-                    key={`column-${columnIndex}`}
+                    key={`cl-row-${rowIndex}-column-${columnIndex}`}
                     value={resolvedValue}
                 />);
         }
diff --git a/src/dash-table/derived/cell/wrappers.tsx b/src/dash-table/derived/cell/wrappers.tsx
index 21aea8388..531a5aedd 100644
--- a/src/dash-table/derived/cell/wrappers.tsx
+++ b/src/dash-table/derived/cell/wrappers.tsx
@@ -113,7 +113,7 @@ class Wrappers {
             'data-dash-row': rowIndex
         }}
         classes={classes}
-        key={`column-${columnIndex}`}
+        key={`row-${rowIndex}-column-${columnIndex}`}
         onClick={onClick}
         onDoubleClick={onDoubleClick}
         onMouseEnter={onEnter}
diff --git a/src/dash-table/derived/header/wrappers.tsx b/src/dash-table/derived/header/wrappers.tsx
index 06d0c60ec..2fe55b10e 100644
--- a/src/dash-table/derived/header/wrappers.tsx
+++ b/src/dash-table/derived/header/wrappers.tsx
@@ -27,7 +27,7 @@ function getter(
                 }
 
                 return (<th
-                    key={`header-cell-${columnIndex}`}
+                    key={`header-cell-${columnIndex}--${column.id}`}
                     data-dash-column={column.id}
                     colSpan={colSpan}
                     className={
