diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 8fbbf64ac..90a0a1ad3 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -582,6 +582,7 @@
     if (event.target.closest('.collapseButtonMarker')) return;
     if (event.target.closest('input')) return;
 
+    shiftDragStartCell = null;
     // event.target.closest('table').focus();
     event.preventDefault();
     if (domFocusField) domFocusField.focus();
@@ -755,7 +756,7 @@
 
     handleCursorMove(event);
 
-    if (event.shiftKey) {
+    if (event.shiftKey && event.keyCode != keycodes.shift) {
       selectedCells = getCellRange(shiftDragStartCell || currentCell, currentCell);
     }
   }