diff --git a/src/data-workspace/data-entry-cell/data-entry-cell.module.css b/src/data-workspace/data-entry-cell/data-entry-cell.module.css
index ae5603d8d..bf11c64b8 100644
--- a/src/data-workspace/data-entry-cell/data-entry-cell.module.css
+++ b/src/data-workspace/data-entry-cell/data-entry-cell.module.css
@@ -24,12 +24,18 @@
     outline: 1px solid #a0adba;
 }
 
+.active {
+    background-color: #fff !important;
+}
+
 .highlighted {
     outline: 3px solid var(--colors-grey800) !important;
     border: none !important;
-    background: #fff !important;
+    /* Fix to prevent bottom outline to be clipped by next cell */
+    z-index: 1;
 }
 
+
 .highlighted.active {
     outline-color: var(--theme-focus) !important;
 }
@@ -38,10 +44,11 @@
     background: var(--colors-grey300);
 }
 
-.invalid:not(.highlighted) {
+.invalid:not(.active) {
     background: var(--colors-red200);
-    outline: 1px solid var(--colors-red600) !important;
+    outline: 1px solid var(--colors-red600);
 }
+
 .invalid:hover {
     background: #ffb3bc;
 }