diff --git a/dist/frappe-datatable.cjs.js b/dist/frappe-datatable.cjs.js
index 2cec045..11a346f 100644
--- a/dist/frappe-datatable.cjs.js
+++ b/dist/frappe-datatable.cjs.js
@@ -1328,6 +1328,8 @@ class CellManager {
       return;
     }
 
+    this.scrollToCell($cell);
+
     this.deactivateEditing();
     if (!skipClearSelection) {
       this.clearSelection();
@@ -1344,7 +1346,6 @@ class CellManager {
     $cell.focus();
 
     this.highlightRowColumnHeader($cell);
-    this.scrollToCell($cell);
   }
 
   highlightRowColumnHeader($cell) {
diff --git a/dist/frappe-datatable.js b/dist/frappe-datatable.js
index 06837ea..5edabbb 100644
--- a/dist/frappe-datatable.js
+++ b/dist/frappe-datatable.js
@@ -1327,6 +1327,8 @@ class CellManager {
       return;
     }
 
+    this.scrollToCell($cell);
+
     this.deactivateEditing();
     if (!skipClearSelection) {
       this.clearSelection();
@@ -1343,7 +1345,6 @@ class CellManager {
     $cell.focus();
 
     this.highlightRowColumnHeader($cell);
-    this.scrollToCell($cell);
   }
 
   highlightRowColumnHeader($cell) {
diff --git a/src/cellmanager.js b/src/cellmanager.js
index 270413d..b03cb31 100644
--- a/src/cellmanager.js
+++ b/src/cellmanager.js
@@ -174,6 +174,8 @@ export default class CellManager {
       return;
     }
 
+    this.scrollToCell($cell);
+
     this.deactivateEditing();
     if (!skipClearSelection) {
       this.clearSelection();
@@ -190,7 +192,6 @@ export default class CellManager {
     $cell.focus();
 
     this.highlightRowColumnHeader($cell);
-    this.scrollToCell($cell);
   }
 
   highlightRowColumnHeader($cell) {