diff --git a/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridRow.cs b/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridRow.cs
index bd6c58d5..a70d6e5a 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridRow.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridRow.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Linq;
 using System.Text;
 using Avalonia.Controls.Metadata;
 using Avalonia.Controls.Models.TreeDataGrid;
 using Avalonia.Controls.Selection;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -157,7 +159,8 @@ protected override void OnPointerMoved(PointerEventArgs e)
             if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed || 
                 e.Handled ||
                 Math.Abs(delta.X) < DragDistance && Math.Abs(delta.Y) < DragDistance ||
-                _mouseDownPosition == s_InvalidPoint)
+                _mouseDownPosition == s_InvalidPoint ||
+                (CellsPresenter?.GetVisualChildren()?.Any(x => x is TreeDataGridCell c && c.IsEditing) == true))
                 return;
 
             _mouseDownPosition = s_InvalidPoint;