diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
index a05026b6..308e8767 100644
--- a/src/components/Table/Table.tsx
+++ b/src/components/Table/Table.tsx
@@ -176,9 +176,16 @@ export default function Table({
     (event: React.UIEvent<HTMLDivElement>) => {
       // Select corresponding header cell when scrolled to prevent jumping
       dataGridRef?.current?.selectCell({
-        idx: selectedColumnIndex || 0,
+        idx:
+          selectedColumnIndex > -1 ? selectedColumnIndex : columns.length - 1,
         rowIdx: -1,
       });
+      // console.log(
+      //   "scroll",
+      //   dataGridRef?.current,
+      //   selectedColumnIndex,
+      //   columns.length
+      // );
 
       const target = event.target as HTMLDivElement;