diff --git a/source/main.pas b/source/main.pas
index f2761cac..afd3fdeb 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -6090,12 +6090,6 @@ begin
 
     DataGridFocusedNodeIndex := Min(DataGridFocusedNodeIndex, Int64(vt.RootNodeCount)-1);
     SelectNode(vt, DataGridFocusedNodeIndex);
-    for i:=0 to vt.Header.Columns.Count-1 do begin
-      if vt.Header.Columns[i].Text = DataGridFocusedColumnName then begin
-        vt.FocusedColumn := i;
-        break;
-      end;
-    end;
     if RefreshingData then begin
 
       if (FDataGridLastClickedColumnHeader >= 0) and (FDataGridLastClickedColumnHeader < vt.Header.Columns.Count) then begin // See issue #3309
@@ -6108,6 +6102,12 @@ begin
 
       vt.OffsetXY := OldScrollOffset;
     end;
+    for i:=0 to vt.Header.Columns.Count-1 do begin
+      if vt.Header.Columns[i].Text = DataGridFocusedColumnName then begin
+        vt.FocusedColumn := i;
+        break;
+      end;
+    end;
 
     // Reset remembered data for last clicked column header
     FDataGridLastClickedColumnHeader := NoColumn;