diff --git a/src/client/components/DataGrid/DataCell/DataCell.scss b/src/client/components/DataGrid/DataCell/DataCell.scss
index 854a61fb4f..a57d0df220 100644
--- a/src/client/components/DataGrid/DataCell/DataCell.scss
+++ b/src/client/components/DataGrid/DataCell/DataCell.scss
@@ -79,7 +79,7 @@ $highlight-top-bottom: inset 0 1px $ui-accent, inset 0 -1px $ui-accent;
   border-left: $border-editable;
   border-top: $border-editable;
 
-  &.bottomEditable {
+  &.lastEditableRow {
     border-bottom: $border-editable;
   }
 
@@ -91,7 +91,7 @@ $highlight-top-bottom: inset 0 1px $ui-accent, inset 0 -1px $ui-accent;
     border-bottom: $border-editable;
   }
 
-  &.rightEditable {
+  &.lastEditableCol {
     border-right: $border-editable;
   }
 
@@ -168,7 +168,7 @@ $highlight-top-bottom: inset 0 1px $ui-accent, inset 0 -1px $ui-accent;
       border-left: $border-editable;
     }
 
-    &.rightEditable {
+    &.lastEditableCol {
       border-left: $border-editable;
     }
   }
diff --git a/src/client/pages/Section/DataTable/Table/hooks/useCellBorderCorrection.ts b/src/client/pages/Section/DataTable/Table/hooks/useCellBorderCorrection.ts
index 27a03f17af..8c97a074e1 100644
--- a/src/client/pages/Section/DataTable/Table/hooks/useCellBorderCorrection.ts
+++ b/src/client/pages/Section/DataTable/Table/hooks/useCellBorderCorrection.ts
@@ -36,13 +36,13 @@ export const useCellBorderCorrection = (props: Props) => {
 
         if (!Objects.isEmpty(rightCell) && !rightCell.classList.contains('editable')) {
           if (!rightCell.classList.contains('actions')) {
-            cell.classList.add('rightEditable')
+            cell.classList.add('lastEditableCol')
           }
         }
 
         if (!Objects.isEmpty(bottomCell) && !bottomCell.classList.contains('editable')) {
           if (!bottomCell.classList.contains('actions')) {
-            cell.classList.add('bottomEditable')
+            cell.classList.add('lastEditableRow')
           }
         }
       })