diff --git a/packages/core/src/data-editor/data-editor.tsx b/packages/core/src/data-editor/data-editor.tsx
index 7621f149f..3d860fb07 100644
--- a/packages/core/src/data-editor/data-editor.tsx
+++ b/packages/core/src/data-editor/data-editor.tsx
@@ -2518,14 +2518,14 @@ const DataEditorImpl: React.ForwardRefRenderFunction<DataEditorRef, DataEditorPr
         let [col, row] = args.location;
         const visible = visibleRegionRef.current;
         if (xDir === -1) {
-            col = visible.x;
+            col = visible.extras?.freezeRegion?.x ?? visible.x;
         } else if (xDir === 1) {
             col = visible.x + visible.width;
         }
         if (yDir === -1) {
             row = Math.max(0, visible.y);
         } else if (yDir === 1) {
-            row = Math.min(rows, visible.y + visible.height);
+            row = Math.min(rows - 1, visible.y + visible.height);
         }
         onItemHoveredImpl({
             ...args,
diff --git a/packages/core/src/internal/data-grid/data-grid.tsx b/packages/core/src/internal/data-grid/data-grid.tsx
index 20cdaebf5..081ed9e00 100644
--- a/packages/core/src/internal/data-grid/data-grid.tsx
+++ b/packages/core/src/internal/data-grid/data-grid.tsx
@@ -515,7 +515,7 @@ const DataGrid: React.ForwardRefRenderFunction<DataGridRef, DataGridProps> = (p,
             const isTouch = (ev !== undefined && !(ev instanceof MouseEvent)) || (ev as any)?.pointerType === "touch";
 
             const scrollEdge: GridMouseEventArgs["scrollEdge"] = [
-                x < stickyX ? -1 : rect.width < x ? 1 : 0,
+                x < 0 ? -1 : rect.width < x ? 1 : 0,
                 y < totalHeaderHeight ? -1 : rect.height < y ? 1 : 0,
             ];
 
@@ -655,7 +655,6 @@ const DataGrid: React.ForwardRefRenderFunction<DataGridRef, DataGridProps> = (p,
             getBoundsForItem,
             fillHandle,
             selection,
-            stickyX,
             totalHeaderHeight,
         ]
     );