1 files changed, 7 insertions, 4 deletions
diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
index 992ee2ec9..6838662c7 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
@@ -585,10 +585,13 @@ export class CollectionSchemaView extends CollectionSubView() {
         this._highlightedCells = [...cellsToHighlight];
         this._highlightedCells.forEach(info => {
             const color = randomRGBColor();
-            const cell = this.getCellElement(info[0], info[1]);
-            if (!this._cellHighlightColors.has(cell)) {this._cellHighlightColors.set(cell, new Array<string>(`solid 2px ${color[0]}`, color[1]))}
-            cell.style.border = this._cellHighlightColors.get(cell)[0];
-            cell.style.backgroundColor = this._cellHighlightColors.get(cell)[1];
+            const doc = info[0]; 
+            const field = info[1];
+            const key = `${doc}_${field}`;
+            const cell = this.getCellElement(doc, field);
+            if (!this._cellHighlightColors.has(key)) {this._cellHighlightColors.set(key, new Array<string>(`solid 2px ${color[0]}`, color[1]))}
+            cell.style.border = this._cellHighlightColors.get(key)[0];
+            cell.style.backgroundColor = this._cellHighlightColors.get(key)[1];
         });
 
     }