diff --git a/package.json b/package.json
index 5364ad9186..9916f0eab6 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.1.0",
     "react-router-dom": "^6.11.1",
-    "rollup": "^3.26.2",
+    "rollup": "^4.0.2",
     "rollup-plugin-postcss": "^4.0.2",
     "typescript": "~5.2.2",
     "vite": "^4.4.9",
diff --git a/src/Cell.tsx b/src/Cell.tsx
index d0a26f28bd..cb04228a69 100644
--- a/src/Cell.tsx
+++ b/src/Cell.tsx
@@ -2,7 +2,7 @@ import { memo } from 'react';
 import { css } from '@linaria/core';
 
 import { useRovingTabIndex } from './hooks';
-import { createCellEvent, getCellClassname, getCellStyle, isCellEditable } from './utils';
+import { createCellEvent, getCellClassname, getCellStyle, isCellEditableUtil } from './utils';
 import type { CellRendererProps } from './types';
 
 const cellCopied = css`
@@ -51,7 +51,7 @@ function Cell<R, SR>({
     },
     typeof cellClass === 'function' ? cellClass(row) : cellClass
   );
-  const isEditable = isCellEditable(column, row);
+  const isEditable = isCellEditableUtil(column, row);
 
   function selectCellWrapper(openEditor?: boolean) {
     selectCell({ rowIdx, idx: column.idx }, openEditor);
diff --git a/src/DataGrid.tsx b/src/DataGrid.tsx
index f2cb7a8fb1..9d1b554cff 100644
--- a/src/DataGrid.tsx
+++ b/src/DataGrid.tsx
@@ -838,7 +838,8 @@ function DataGrid<R, SR, K extends Key>(
       return;
     }
 
-    const column = columns[selectedPosition.idx];
+    const { idx, rowIdx } = selectedPosition;
+    const column = columns[idx];
     if (column.renderEditCell == null || column.editable === false) {
       return;
     }
@@ -847,10 +848,12 @@ function DataGrid<R, SR, K extends Key>(
 
     return (
       <DragHandle
-        gridRowStart={headerAndTopSummaryRowsCount + selectedPosition.rowIdx + 1}
+        gridRowStart={headerAndTopSummaryRowsCount + rowIdx + 1}
         rows={rows}
         column={column}
         columnWidth={columnWidth}
+        maxColIdx={maxColIdx}
+        isLastRow={rowIdx === maxRowIdx}
         selectedPosition={selectedPosition}
         isCellEditable={isCellEditable}
         latestDraggedOverRowIdx={latestDraggedOverRowIdx}
diff --git a/src/DragHandle.tsx b/src/DragHandle.tsx
index fc8321515c..a07703c576 100644
--- a/src/DragHandle.tsx
+++ b/src/DragHandle.tsx
@@ -36,6 +36,8 @@ interface Props<R, SR> extends Pick<DataGridProps<R, SR>, 'rows' | 'onRowsChange
   gridRowStart: number;
   column: CalculatedColumn<R, SR>;
   columnWidth: number | string;
+  maxColIdx: number;
+  isLastRow: boolean;
   selectedPosition: SelectCellState;
   latestDraggedOverRowIdx: React.MutableRefObject<number | undefined>;
   isCellEditable: (position: Position) => boolean;
@@ -50,6 +52,8 @@ export default function DragHandle<R, SR>({
   rows,
   column,
   columnWidth,
+  maxColIdx,
+  isLastRow,
   selectedPosition,
   latestDraggedOverRowIdx,
   isCellEditable,
@@ -118,19 +122,26 @@ export default function DragHandle<R, SR>({
     }
   }
 
-  const colSpan = column.colSpan?.({ type: 'ROW', row: rows[rowIdx] }) ?? 1;
-  const style = getCellStyle(column, colSpan);
+  function getStyle(): React.CSSProperties {
+    const colSpan = column.colSpan?.({ type: 'ROW', row: rows[rowIdx] }) ?? 1;
+    const { insetInlineStart, ...style } = getCellStyle(column, colSpan);
+    const marginEnd = 'calc(var(--rdg-drag-handle-size) * -0.5 + 1px)';
+    const isLastColumn = column.idx + colSpan - 1 === maxColIdx;
+
+    return {
+      ...style,
+      gridRowStart,
+      marginInlineEnd: isLastColumn ? undefined : marginEnd,
+      marginBlockEnd: isLastRow ? undefined : marginEnd,
+      insetInlineStart: insetInlineStart
+        ? `calc(${insetInlineStart} + ${columnWidth}px + var(--rdg-drag-handle-size) * -0.5 - 1px)`
+        : undefined
+    };
+  }
 
   return (
     <div
-      style={{
-        ...style,
-        gridRowStart,
-        insetInlineStart:
-          style.insetInlineStart && typeof columnWidth === 'number'
-            ? `calc(${style.insetInlineStart} + ${columnWidth}px - var(--rdg-drag-handle-size))`
-            : undefined
-      }}
+      style={getStyle()}
       className={clsx(cellDragHandleClassname, column.frozen && cellDragHandleFrozenClassname)}
       onClick={onClick}
       onMouseDown={handleMouseDown}
diff --git a/src/utils/index.ts b/src/utils/index.ts
index aa04223098..35e428b772 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -8,7 +8,7 @@ export * from './renderMeasuringCells';
 export * from './selectedCellUtils';
 export * from './styleUtils';
 
-export const { min, max, round, floor, sign, abs } = Math;
+export const { min, max, floor, sign, abs } = Math;
 
 export function assertIsValidKeyGetter<R, K extends React.Key>(
   keyGetter: unknown
diff --git a/src/utils/selectedCellUtils.ts b/src/utils/selectedCellUtils.ts
index 956aabcef2..a3142da8ce 100644
--- a/src/utils/selectedCellUtils.ts
+++ b/src/utils/selectedCellUtils.ts
@@ -20,10 +20,11 @@ export function isSelectedCellEditable<R, SR>({
 }: IsSelectedCellEditableOpts<R, SR>): boolean {
   const column = columns[selectedPosition.idx];
   const row = rows[selectedPosition.rowIdx];
-  return isCellEditable(column, row);
+  return isCellEditableUtil(column, row);
 }
 
-export function isCellEditable<R, SR>(column: CalculatedColumn<R, SR>, row: R): boolean {
+// https://github.com/vercel/next.js/issues/56480
+export function isCellEditableUtil<R, SR>(column: CalculatedColumn<R, SR>, row: R): boolean {
   return (
     column.renderEditCell != null &&
     (typeof column.editable === 'function' ? column.editable(row) : column.editable) !== false