diff --git a/src/components/datatable/DataTable.vue b/src/components/datatable/DataTable.vue
index 138ad2f2f3..3e86dfeff8 100755
--- a/src/components/datatable/DataTable.vue
+++ b/src/components/datatable/DataTable.vue
@@ -407,6 +407,10 @@ export default {
         if (this.isStateful() && this.resizableColumns) {
             this.restoreColumnWidths();
         }
+
+        if (this.editMode === 'row' && this.dataKey && !this.d_editingRowKeys) {
+            this.updateEditingRowKeys(this.editingRows);
+        }
     },
     beforeUnmount() {
         this.unbindColumnResizeEvents();
@@ -417,6 +421,10 @@ export default {
         if (this.isStateful()) {
             this.saveState();
         }
+
+        if (this.editMode === 'row' && this.dataKey && !this.d_editingRowKeys) {
+            this.updateEditingRowKeys(this.editingRows);
+        }
     },
     methods: {
         columnProp(col, prop) {