diff --git a/docs/column-types.md b/docs/column-types.md
index d89a313b..85f88abf 100644
--- a/docs/column-types.md
+++ b/docs/column-types.md
@@ -56,9 +56,18 @@ The first parameter in the constructor is a nested column, you would usually wan
 The sample above is taken from [this article](https://github.com/AvaloniaUI/Avalonia.Controls.TreeDataGrid/blob/master/docs/get-started-hierarchical.md). If you feel like you need more examples feel free to check it, there is a sample that shows how to use `HierarchicalExpanderColumn` and how to run a whole `TreeDataGrid` using it. 
 
 ## TemplateColumn
-TemplateColumn is the most customizable option to create a column. You can put basically everything that you can put into `IDataTemplate` into this column cells.
 
-There are two ways to instantiate a `TemplateColumn`:
+TemplateColumn is the most customizable way to create a column. Because cell contents are described by a data template, the options for how each cell is displayed is almost unlimited.
+
+The `TemplateColumn` constructor takes the following parameters:
+
+- `header`: The Column header
+- `cellTemplate`: A data template which describes how cells in the column will be displayed
+- `cellEditingTemplate`: A data template which describes how cells in the column will be displayed when in edit mode. If no `cellEditingTemplate` is provided, then edit mode will be disabled for the column.
+- `width`: The width of the column
+- `options`: Less frequently used options for the column
+
+There are two overloads of the `TemplateColumn` constructor, which corresponds to the two ways in which a template can be specified:
 
 1. Using a `FuncDataTemplate` to create a template in code:
 
@@ -93,9 +102,4 @@ new TemplateColumn<Person>(
 new TemplateColumn<Person>("Selected", "CheckBoxCell");
 ```
 
-`TemplateColumn` has only one generic parameter, it is your model type, same as in `TextColumn`, Person in this case. Code above will create a column with header *"Selected"* and `CheckBox` in each cell.
-
-`TemplateColumn` has two required parameters. The first one is the column header as everywhere. The second is either:
-
-1. An `IDataTemplate`; a template that contains stuff that you want to be displayed in the cells of this column.
-2. The key of a template defined in a XAML resource.
+`TemplateColumn` has only one generic parameter, it is your model type, the same as in `TextColumn`; `Person` in this case. The code above will create a column with header *"Selected"* and a `CheckBox` in each cell.
diff --git a/samples/TreeDataGridDemo/MainWindow.axaml b/samples/TreeDataGridDemo/MainWindow.axaml
index 71d7c429..2a1ba4c5 100644
--- a/samples/TreeDataGridDemo/MainWindow.axaml
+++ b/samples/TreeDataGridDemo/MainWindow.axaml
@@ -29,6 +29,17 @@
         <TreeDataGrid Name="countries"
                       Source="{Binding Countries.Source}"
                       AutoDragDropRows="True">
+          <TreeDataGrid.Resources>
+            <!-- Template for Region column cells -->
+            <DataTemplate x:Key="RegionCell" DataType="m:Country">
+              <TextBlock Text="{Binding Region}"/>
+            </DataTemplate>
+            <DataTemplate x:Key="RegionEditCell" DataType="m:Country">
+              <ComboBox ItemsSource="{x:Static m:Countries.Regions}"
+                        SelectedItem="{Binding Region}"/>
+            </DataTemplate>
+
+          </TreeDataGrid.Resources>
           <TreeDataGrid.Styles>
             <Style Selector="TreeDataGrid TreeDataGridRow:nth-last-child(2n)">
               <Setter Property="Background" Value="#20808080"/>
@@ -62,8 +73,8 @@
         <TextBlock Classes="realized-count" DockPanel.Dock="Bottom"/>
         <TreeDataGrid Name="fileViewer" Source="{Binding Files.Source}">
           <TreeDataGrid.Resources>
-            
-              <!-- Template for Name column cells -->
+
+            <!-- Template for Name column cells -->
             <DataTemplate x:Key="FileNameCell" DataType="m:FileTreeNodeModel">
               <StackPanel Orientation="Horizontal">
                 <Image Margin="0 0 4 0"
@@ -78,7 +89,23 @@
                 <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/>
               </StackPanel>
             </DataTemplate>
-              
+
+            <!-- Edit template for Name column cells -->
+            <DataTemplate x:Key="FileNameEditCell" DataType="m:FileTreeNodeModel">
+              <StackPanel Orientation="Horizontal">
+                <Image Margin="0 0 4 0"
+                       VerticalAlignment="Center">
+                  <Image.Source>
+                    <MultiBinding Converter="{x:Static vm:FilesPageViewModel.FileIconConverter}">
+                      <Binding Path="IsDirectory"/>
+                      <Binding Path="IsExpanded"/>
+                    </MultiBinding>
+                  </Image.Source>
+                </Image>
+                <TextBox Text="{Binding Name}" VerticalAlignment="Center"/>
+              </StackPanel>
+            </DataTemplate>
+
           </TreeDataGrid.Resources>
           <TreeDataGrid.Styles>
             <Style Selector="TreeDataGrid TreeDataGridRow:nth-child(2n)">
diff --git a/samples/TreeDataGridDemo/Models/Countries.cs b/samples/TreeDataGridDemo/Models/Countries.cs
index 31ddc6d2..7eec8366 100644
--- a/samples/TreeDataGridDemo/Models/Countries.cs
+++ b/samples/TreeDataGridDemo/Models/Countries.cs
@@ -6,6 +6,7 @@ namespace TreeDataGridDemo.Models
     internal static class Countries
     {
         private static IReadOnlyList<Country>? _all;
+        private static IReadOnlyList<string>? _regions;
 
         private static IEnumerable<Country> GetCountries()
         {
@@ -238,5 +239,6 @@ private static IEnumerable<Country> GetCountries()
         }
 
         public static IReadOnlyList<Country> All => _all ??= GetCountries().ToList();
+        public static IReadOnlyList<string> Regions => _regions ??= All.Select(x => x.Region).ToList();
     }
 }
diff --git a/samples/TreeDataGridDemo/Models/FileTreeNodeModel.cs b/samples/TreeDataGridDemo/Models/FileTreeNodeModel.cs
index 62f7251c..3e1b7358 100644
--- a/samples/TreeDataGridDemo/Models/FileTreeNodeModel.cs
+++ b/samples/TreeDataGridDemo/Models/FileTreeNodeModel.cs
@@ -1,16 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.IO;
 using Avalonia.Threading;
 using ReactiveUI;
 
 namespace TreeDataGridDemo.Models
 {
-    public class FileTreeNodeModel : ReactiveObject
+    public class FileTreeNodeModel : ReactiveObject, IEditableObject
     {
         private string _path;
         private string _name;
+        private string? _undoName;
         private long? _size;
         private DateTimeOffset? _modified;
         private FileSystemWatcher? _watcher;
@@ -153,6 +155,10 @@ private ObservableCollection<FileTreeNodeModel> LoadChildren()
             };
         }
 
+        void IEditableObject.BeginEdit() => _undoName = _name;
+        void IEditableObject.CancelEdit() => _name = _undoName!;
+        void IEditableObject.EndEdit() => _undoName = null;
+
         private void OnChanged(object sender, FileSystemEventArgs e)
         {
             if (e.ChangeType == WatcherChangeTypes.Changed && File.Exists(e.FullPath))
diff --git a/samples/TreeDataGridDemo/ViewModels/CountriesPageViewModel.cs b/samples/TreeDataGridDemo/ViewModels/CountriesPageViewModel.cs
index ce4c0142..ca5c92ab 100644
--- a/samples/TreeDataGridDemo/ViewModels/CountriesPageViewModel.cs
+++ b/samples/TreeDataGridDemo/ViewModels/CountriesPageViewModel.cs
@@ -23,9 +23,9 @@ public CountriesPageViewModel()
                 {
                     new TextColumn<Country, string>("Country", x => x.Name, (r, v) => r.Name = v, new GridLength(6, GridUnitType.Star), new()
                     {
-                        IsTextSearchEnabled = true
+                        IsTextSearchEnabled = true,
                     }),
-                    new TextColumn<Country, string>("Region", x => x.Region, new GridLength(4, GridUnitType.Star)),
+                    new TemplateColumn<Country>("Region", "RegionCell", "RegionEditCell"),
                     new TextColumn<Country, int>("Population", x => x.Population, new GridLength(3, GridUnitType.Star)),
                     new TextColumn<Country, int>("Area", x => x.Area, new GridLength(3, GridUnitType.Star)),
                     new TextColumn<Country, int>("GDP", x => x.GDP, new GridLength(3, GridUnitType.Star), new()
diff --git a/samples/TreeDataGridDemo/ViewModels/FilesPageViewModel.cs b/samples/TreeDataGridDemo/ViewModels/FilesPageViewModel.cs
index 2faf80a6..ff1d8ef8 100644
--- a/samples/TreeDataGridDemo/ViewModels/FilesPageViewModel.cs
+++ b/samples/TreeDataGridDemo/ViewModels/FilesPageViewModel.cs
@@ -54,6 +54,7 @@ public FilesPageViewModel()
                         new TemplateColumn<FileTreeNodeModel>(
                             "Name",
                             "FileNameCell",
+                            "FileNameEditCell",
                             new GridLength(1, GridUnitType.Star),
                             new()
                             {
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/CheckBoxCell.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/CheckBoxCell.cs
index 790efdd3..d0cf6df7 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/CheckBoxCell.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/CheckBoxCell.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Reactive.Subjects;
+using System.Reflection;
 using Avalonia.Data;
 
 namespace Avalonia.Controls.Models.TreeDataGrid
@@ -33,6 +34,7 @@ public CheckBoxCell(
         }
 
         public bool CanEdit => false;
+        public BeginEditGestures EditGestures => BeginEditGestures.None;
         public bool SingleTapEdit => false;
         public bool IsReadOnly { get; }
         public bool IsThreeState { get; }
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ColumnOptions.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ColumnOptions.cs
index 1bfc5de3..61cf5994 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ColumnOptions.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ColumnOptions.cs
@@ -2,6 +2,41 @@
 
 namespace Avalonia.Controls.Models.TreeDataGrid
 {
+    [Flags]
+    public enum BeginEditGestures
+    {
+        /// <summary>
+        /// A cell will only enter edit mode programmatically.
+        /// </summary>
+        None = 0x00,
+
+        /// <summary>
+        /// A cell will enter edit mode when the user presses F2.
+        /// </summary>
+        F2 = 0x01,
+
+        /// <summary>
+        /// A cell will enter edit mode when the user taps it.
+        /// </summary>
+        Tap = 0x02,
+
+        /// <summary>
+        /// A cell will enter edit mode when the user double-taps it.
+        /// </summary>
+        DoubleTap = 0x4,
+
+        /// <summary>
+        /// A cell will enter edit mode in conjuction with a gesture only when the cell or row
+        /// is currently selected.
+        /// </summary>
+        WhenSelected = 0x1000,
+
+        /// <summary>
+        /// A cell will enter edit mode when the user presses F2 or double-taps it.
+        /// </summary>
+        Default = F2 | DoubleTap,
+    }
+
     /// <summary>
     /// Holds less commonly-used options for an <see cref="IColumn{TModel}"/>.
     /// </summary>
@@ -45,5 +80,10 @@ public class ColumnOptions<TModel>
         /// Gets or sets a custom comparison for descending ordered columns.
         /// </summary>
         public Comparison<TModel?>? CompareDescending { get; set; }
+
+        /// <summary>
+        /// Gets or sets the gesture(s) that will cause a cell to enter edit mode.
+        /// </summary>
+        public BeginEditGestures BeginEditGestures { get; set; } = BeginEditGestures.Default;
     }
 }
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ExpanderCell.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ExpanderCell.cs
index 66f39d0d..2256fc1c 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ExpanderCell.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ExpanderCell.cs
@@ -38,8 +38,8 @@ public ExpanderCell(
 
         public bool CanEdit => _inner.CanEdit;
         public ICell Content => _inner;
+        public BeginEditGestures EditGestures => _inner.EditGestures;
         public IExpanderRow<TModel> Row { get; }
-        public bool SingleTapEdit => _inner.SingleTapEdit;
         public bool ShowExpander => Row.ShowExpander;
         public object? Value => _inner.Value;
 
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ICell.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ICell.cs
index 54fd4db0..4724bdde 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ICell.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ICell.cs
@@ -13,12 +13,9 @@ public interface ICell
         bool CanEdit { get; }
 
         /// <summary>
-        /// Gets a value indicating whether a single tap will begin edit mode on a cell.
+        /// Gets the gesture(s) that will cause the cell to enter edit mode.
         /// </summary>
-        /// <remarks>
-        /// If false, a double-tap is required to enter edit mode.
-        /// </remarks>
-        bool SingleTapEdit { get; }
+        BeginEditGestures EditGestures { get; }
 
         /// <summary>
         /// Gets the value of the cell.
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ICellOptions.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ICellOptions.cs
new file mode 100644
index 00000000..bc21c200
--- /dev/null
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ICellOptions.cs
@@ -0,0 +1,12 @@
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Models.TreeDataGrid
+{
+    public interface ICellOptions
+    {
+        /// <summary>
+        /// Gets the gesture(s) that will cause the cell to enter edit mode.
+        /// </summary>
+        BeginEditGestures BeginEditGestures { get; }
+    }
+}
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ITemplateCellOptions.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ITemplateCellOptions.cs
new file mode 100644
index 00000000..14d7db21
--- /dev/null
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ITemplateCellOptions.cs
@@ -0,0 +1,8 @@
+using Avalonia.Media;
+
+namespace Avalonia.Controls.Models.TreeDataGrid
+{
+    public interface ITemplateCellOptions : ICellOptions
+    {
+    }
+}
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ITextCellOptions.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ITextCellOptions.cs
index aeb618d2..889de12f 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ITextCellOptions.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/ITextCellOptions.cs
@@ -2,16 +2,8 @@
 
 namespace Avalonia.Controls.Models.TreeDataGrid
 {
-    public interface ITextCellOptions
+    public interface ITextCellOptions : ICellOptions
     {
-        /// <summary>
-        /// Gets a value indicating whether a single tap will begin edit mode on a cell.
-        /// </summary>
-        /// <remarks>
-        /// If false, a double-tap is required to enter edit mode.
-        /// </remarks>
-        bool SingleTapEdit { get; }
-
         /// <summary>
         /// Gets the text trimming mode for the cell.
         /// </summary>
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateCell.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateCell.cs
index 84d7ae91..2d070f12 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateCell.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateCell.cs
@@ -1,20 +1,34 @@
 
 using System;
+using System.ComponentModel;
 using Avalonia.Controls.Templates;
 
 namespace Avalonia.Controls.Models.TreeDataGrid
 {
-    public class TemplateCell : ICell
+    public class TemplateCell : ICell, IEditableObject
     {
-        public TemplateCell(object? value, Func<Control, IDataTemplate> getCellTemplate)
+        private ITemplateCellOptions? _options;
+
+        public TemplateCell(
+            object? value,
+            Func<Control, IDataTemplate> getCellTemplate,
+            Func<Control, IDataTemplate>? getCellEditingTemplate,
+            ITemplateCellOptions? options)
         {
             GetCellTemplate = getCellTemplate;
+            GetCellEditingTemplate = getCellEditingTemplate;
             Value = value;
+            _options = options;
         }
 
-        public bool CanEdit => false;
-        public bool SingleTapEdit => false;
+        public bool CanEdit => GetCellEditingTemplate is not null;
+        public BeginEditGestures EditGestures => _options?.BeginEditGestures ?? BeginEditGestures.Default;
         public Func<Control, IDataTemplate> GetCellTemplate { get; }
+        public Func<Control, IDataTemplate>? GetCellEditingTemplate { get; }
         public object? Value { get; }
+
+        void IEditableObject.BeginEdit() => (Value as IEditableObject)?.BeginEdit();
+        void IEditableObject.CancelEdit() => (Value as IEditableObject)?.CancelEdit();
+        void IEditableObject.EndEdit() => (Value as IEditableObject)?.EndEdit();
     }
 }
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateColumn.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateColumn.cs
index b48fcafc..d10a2102 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateColumn.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateColumn.cs
@@ -14,30 +14,41 @@ namespace Avalonia.Controls.Models.TreeDataGrid
     public class TemplateColumn<TModel> : ColumnBase<TModel>, ITextSearchableColumn<TModel>
     {
         private readonly Func<Control, IDataTemplate> _getCellTemplate;
+        private readonly Func<Control, IDataTemplate>? _getEditingCellTemplate;
         private IDataTemplate? _cellTemplate;
+        private IDataTemplate? _cellEditingTemplate;
         private object? _cellTemplateResourceKey;
+        private object? _cellEditingTemplateResourceKey;
 
         public TemplateColumn(
             object? header,
             IDataTemplate cellTemplate,
+            IDataTemplate? cellEditingTemplate = null,
             GridLength? width = null,
             TemplateColumnOptions<TModel>? options = null)
             : base(header, width, options ?? new())
         {
             _getCellTemplate = GetCellTemplate;
             _cellTemplate = cellTemplate;
+            _cellEditingTemplate = cellEditingTemplate;
+            _getEditingCellTemplate = cellEditingTemplate is not null ?
+                GetCellEditingTemplate : null;
         }
 
         public TemplateColumn(
             object? header,
             object cellTemplateResourceKey,
+            object? cellEditingTemplateResourceKey = null,
             GridLength? width = null,
             TemplateColumnOptions<TModel>? options = null)
             : base(header, width, options ?? new())
         {
-            _getCellTemplate = GetCellTemplate;
             _cellTemplateResourceKey = cellTemplateResourceKey ??
                 throw new ArgumentNullException(nameof(cellTemplateResourceKey));
+            _cellEditingTemplateResourceKey = cellEditingTemplateResourceKey;
+            _getCellTemplate = GetCellTemplate;
+            _getEditingCellTemplate = cellEditingTemplateResourceKey is not null ?
+                GetCellEditingTemplate : null;
         }
 
         public new TemplateColumnOptions<TModel> Options => (TemplateColumnOptions<TModel>)base.Options;
@@ -62,12 +73,33 @@ public IDataTemplate GetCellTemplate(Control anchor)
             return _cellTemplate;
         }
 
+        /// <summary>
+        /// Gets the template to use to display the contents of a cell that is in editing mode.
+        /// </summary>
+        public IDataTemplate GetCellEditingTemplate(Control anchor)
+        {
+            if (_cellEditingTemplate is not null)
+                return _cellEditingTemplate;
+
+            _cellEditingTemplate = anchor.FindResource(_cellEditingTemplateResourceKey!) as IDataTemplate;
+
+            if (_cellEditingTemplate is null)
+                throw new KeyNotFoundException(
+                    $"No data template resource with the key of '{_cellEditingTemplateResourceKey}' " +
+                    "could be found for the template column '{Header}'.");
+
+            return _cellEditingTemplate;
+        }
+
         /// <summary>
         /// Creates a cell for this column on the specified row.
         /// </summary>
         /// <param name="row">The row.</param>
         /// <returns>The cell.</returns>
-        public override ICell CreateCell(IRow<TModel> row) => new TemplateCell(row.Model, _getCellTemplate);
+        public override ICell CreateCell(IRow<TModel> row)
+        {
+            return new TemplateCell(row.Model, _getCellTemplate, _getEditingCellTemplate, Options);
+        }
 
         public override Comparison<TModel?>? GetComparison(ListSortDirection direction)
         {
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateColumnOptions.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateColumnOptions.cs
index ca6e1be6..658947a4 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateColumnOptions.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TemplateColumnOptions.cs
@@ -7,7 +7,7 @@ namespace Avalonia.Controls.Models.TreeDataGrid
     /// Holds less commonly-used options for a <see cref="TemplateColumn{TModel}"/>.
     /// </summary>
     /// <typeparam name="TModel">The model type.</typeparam>
-    public class TemplateColumnOptions<TModel> : ColumnOptions<TModel>
+    public class TemplateColumnOptions<TModel> : ColumnOptions<TModel>, ITemplateCellOptions
     {
         /// <summary>
         /// Gets or sets a value indicating whether the column takes part in text searches.
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextCell.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextCell.cs
index 82bbdb1c..4a7c910d 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextCell.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextCell.cs
@@ -15,12 +15,12 @@ public class TextCell<T> : NotifyingBase, ITextCell, IDisposable, IEditableObjec
         [AllowNull] private T? _value;
         [AllowNull] private T? _cancelValue;
         private bool _isEditing;
+        private ITextCellOptions? _options;
 
         public TextCell(T? value)
         {
             _value = value;
             IsReadOnly = true;
-            TextTrimming = TextTrimming.None;
         }
 
         public TextCell(
@@ -30,9 +30,7 @@ public TextCell(
         {
             _binding = binding;
             IsReadOnly = isReadOnly;
-            TextTrimming = options?.TextTrimming ?? TextTrimming.None;
-            TextWrapping = options?.TextWrapping ?? TextWrapping.NoWrap;
-            SingleTapEdit = options?.SingleTapEdit ?? false;
+            _options = options;
 
             _subscription = binding.Subscribe(x =>
             {
@@ -42,10 +40,10 @@ public TextCell(
         }
 
         public bool CanEdit => !IsReadOnly;
+        public BeginEditGestures EditGestures => _options?.BeginEditGestures ?? BeginEditGestures.Default;
         public bool IsReadOnly { get; }
-        public bool SingleTapEdit { get; }
-        public TextTrimming TextTrimming { get; }
-        public TextWrapping TextWrapping { get; }
+        public TextTrimming TextTrimming => _options?.TextTrimming ?? TextTrimming.None;
+        public TextWrapping TextWrapping => _options?.TextWrapping ?? TextWrapping.NoWrap;
 
         public string? Text
         {
diff --git a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextColumnOptions.cs b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextColumnOptions.cs
index 093dd29e..f28aec2e 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextColumnOptions.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Models/TreeDataGrid/TextColumnOptions.cs
@@ -13,15 +13,6 @@ public class TextColumnOptions<TModel> : ColumnOptions<TModel>, ITextCellOptions
         /// </summary>
         public bool IsTextSearchEnabled { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether a single tap will begin edit mode
-        /// on a cell.
-        /// </summary>
-        /// <remarks>
-        /// If false, a double-tap is required to enter edit mode.
-        /// </remarks>
-        public bool SingleTapEdit { get; set; }
-
         /// <summary>
         /// Gets or sets the text trimming mode for the cells in the column.
         /// </summary>
diff --git a/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridCell.cs b/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridCell.cs
index 5c93c338..1bd8e546 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridCell.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridCell.cs
@@ -4,7 +4,10 @@
 using Avalonia.Controls.Models.TreeDataGrid;
 using Avalonia.Controls.Selection;
 using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using Avalonia.Platform;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -16,10 +19,10 @@ public abstract class TreeDataGridCell : TemplatedControl, ITreeDataGridCell
                 nameof(IsSelected),
                 o => o.IsSelected);
 
-        private bool _isEditing;
+        private static readonly Point s_invalidPoint = new Point(double.NaN, double.NaN);
         private bool _isSelected;
         private TreeDataGrid? _treeDataGrid;
-        private Point _pressedPoint;
+        private Point _pressedPoint = s_invalidPoint;
 
         static TreeDataGridCell()
         {
@@ -29,6 +32,7 @@ static TreeDataGridCell()
 
         public int ColumnIndex { get; private set; } = -1;
         public int RowIndex { get; private set; } = -1;
+        public bool IsEditing { get; private set; }
         public ICell? Model { get; private set; }
 
         public bool IsSelected
@@ -37,6 +41,11 @@ public bool IsSelected
             private set => SetAndRaise(IsSelectedProperty, ref _isSelected, value);
         }
 
+        public bool IsEffectivelySelected
+        {
+            get => IsSelected || this.FindAncestorOfType<TreeDataGridRow>()?.IsSelected == true;
+        }
+
         public virtual void Realize(
             TreeDataGridElementFactory factory,
             ITreeDataGridSelectionInteraction? selection,
@@ -62,13 +71,11 @@ public virtual void Unrealize()
             Model = null;
         }
 
-        protected virtual bool CanEdit => false;
-
         protected void BeginEdit()
         {
-            if (!_isEditing)
+            if (!IsEditing)
             {
-                _isEditing = true;
+                IsEditing = true;
                 (Model as IEditableObject)?.BeginEdit();
                 PseudoClasses.Add(":editing");
             }
@@ -119,6 +126,14 @@ protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
                 _treeDataGrid.RaiseCellPrepared(this, ColumnIndex, RowIndex);
         }
 
+        protected override void OnLostFocus(RoutedEventArgs e)
+        {
+            base.OnLostFocus(e);
+
+            if (!IsKeyboardFocusWithin && IsEditing)
+                EndEdit();
+        }
+
         protected override Size MeasureOverride(Size availableSize)
         {
             var result = base.MeasureOverride(availableSize);
@@ -131,18 +146,13 @@ protected override Size MeasureOverride(Size availableSize)
             return result;
         }
 
-        protected virtual void OnTapped(TappedEventArgs e)
-        {
-            if (!_isEditing && CanEdit && Model?.SingleTapEdit == true && !e.Handled)
-            {
-                BeginEdit();
-                e.Handled = true;
-            }
-        }
-
         protected virtual void OnDoubleTapped(TappedEventArgs e)
         {
-            if (!_isEditing && CanEdit && Model?.SingleTapEdit != true && !e.Handled)
+            if (Model is not null &&
+                !e.Handled &&
+                !IsEditing &&
+                Model.CanEdit &&
+                IsEnabledEditGesture(BeginEditGestures.DoubleTap, Model.EditGestures))
             {
                 BeginEdit();
                 e.Handled = true;
@@ -153,11 +163,27 @@ protected override void OnKeyDown(KeyEventArgs e)
         {
             base.OnKeyDown(e);
 
-            if (!_isEditing && CanEdit && !e.Handled && e.Key == Key.F2)
+            if (Model is null || e.Handled)
+                return;
+
+            if (e.Key == Key.F2 && 
+                !IsEditing && 
+                Model.CanEdit &&
+                IsEnabledEditGesture(BeginEditGestures.F2, Model.EditGestures))
             {
                 BeginEdit();
                 e.Handled = true;
             }
+            else if (e.Key == Key.Enter && IsEditing)
+            {
+                EndEdit();
+                e.Handled = true;
+            }
+            else if (e.Key == Key.Escape && IsEditing)
+            {
+                CancelEdit();
+                e.Handled = true;
+            }
         }
 
         protected virtual void OnModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -168,27 +194,47 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
 
-            if (!_isEditing && CanEdit && Model?.SingleTapEdit == true && !e.Handled)
+            if (Model is not null &&
+                !e.Handled &&
+                !IsEditing &&
+                Model.CanEdit &&
+                IsEnabledEditGesture(BeginEditGestures.Tap, Model.EditGestures))
             {
-                _pressedPoint = e.GetCurrentPoint(this).Position;
+                _pressedPoint = e.GetCurrentPoint(null).Position;
                 e.Handled = true;
             }
+            else
+            {
+                _pressedPoint = s_invalidPoint;
+            }
         }
 
         protected override void OnPointerReleased(PointerReleasedEventArgs e)
         {
             base.OnPointerReleased(e);
 
-            if (!_isEditing && CanEdit && Model?.SingleTapEdit == true && !e.Handled)
+            if (Model is not null &&
+                !e.Handled &&
+                !IsEditing &&
+                !double.IsNaN(_pressedPoint.X) &&
+                Model.CanEdit &&
+                IsEnabledEditGesture(BeginEditGestures.Tap, Model.EditGestures))
             {
-                var point = e.GetCurrentPoint(this).Position;
-
-                if (new Rect(Bounds.Size).ContainsExclusive(point))
+                var point = e.GetCurrentPoint(this);
+                var settings = TopLevel.GetTopLevel(this)?.PlatformSettings;
+                var tapSize = settings?.GetTapSize(point.Pointer.Type) ?? new Size(4, 4);
+                var tapRect = new Rect(_pressedPoint, new Size())
+                       .Inflate(new Thickness(tapSize.Width, tapSize.Height));
+
+                if (new Rect(Bounds.Size).ContainsExclusive(point.Position) &&
+                    tapRect.ContainsExclusive(e.GetCurrentPoint(null).Position))
                 {
                     BeginEdit();
                     e.Handled = true;
                 }
             }
+
+            _pressedPoint = s_invalidPoint;
         }
 
         protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
@@ -201,7 +247,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
             base.OnPropertyChanged(change);
         }
 
-        public void UpdateRowIndex(int index) => RowIndex = index;
+        internal void UpdateRowIndex(int index) => RowIndex = index;
 
         internal void UpdateSelection(ITreeDataGridSelectionInteraction? selection)
         {
@@ -210,10 +256,10 @@ internal void UpdateSelection(ITreeDataGridSelectionInteraction? selection)
 
         private bool EndEditCore()
         {
-            if (_isEditing)
+            if (IsEditing)
             {
                 var restoreFocus = IsKeyboardFocusWithin;
-                _isEditing = false;
+                IsEditing = false;
                 PseudoClasses.Remove(":editing");
                 if (restoreFocus)
                     Focus();
@@ -222,5 +268,14 @@ private bool EndEditCore()
 
             return false;
         }
+
+        private bool IsEnabledEditGesture(BeginEditGestures gesture, BeginEditGestures enabledGestures)
+        {
+            if (!enabledGestures.HasFlag(gesture))
+                return false;
+
+            return enabledGestures.HasFlag(BeginEditGestures.WhenSelected) ?
+                IsEffectivelySelected : true;
+        }
     }
 }
diff --git a/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTemplateCell.cs b/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTemplateCell.cs
index 75cadc5b..4001d865 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTemplateCell.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTemplateCell.cs
@@ -1,8 +1,13 @@
 using System;
+using System.Linq;
 using Avalonia.Controls.Models.TreeDataGrid;
+using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Selection;
 using Avalonia.Controls.Templates;
+using Avalonia.Input;
+using Avalonia.Interactivity;
 using Avalonia.LogicalTree;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls.Primitives
 {
@@ -18,20 +23,34 @@ public class TreeDataGridTemplateCell : TreeDataGridCell
                 nameof(ContentTemplate),
                 x => x.ContentTemplate);
 
+        public static readonly DirectProperty<TreeDataGridTemplateCell, IDataTemplate?> EditingTemplateProperty =
+            AvaloniaProperty.RegisterDirect<TreeDataGridTemplateCell, IDataTemplate?>(
+                nameof(EditingTemplate),
+                x => x.EditingTemplate);
+
         private object? _content;
         private IDataTemplate? _contentTemplate;
+        private IDataTemplate? _editingTemplate;
+        private ContentPresenter? _editingContentPresenter;
 
         public object? Content 
         { 
             get => _content;
             private set => SetAndRaise(ContentProperty, ref _content, value);
         }
+
         public IDataTemplate? ContentTemplate 
         { 
             get => _contentTemplate;
             set => SetAndRaise(ContentTemplateProperty, ref _contentTemplate, value);
         }
 
+        public IDataTemplate? EditingTemplate
+        {
+            get => _editingTemplate;
+            set => SetAndRaise(EditingTemplateProperty, ref _editingTemplate, value);
+        }
+
         public override void Realize(
             TreeDataGridElementFactory factory,
             ITreeDataGridSelectionInteraction? selection, 
@@ -49,12 +68,36 @@ public override void Unrealize()
             base.Unrealize();
         }
 
+        protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
+        {
+            base.OnApplyTemplate(e);
+
+            if (_editingContentPresenter is not null)
+                _editingContentPresenter.LostFocus -= EditingContentPresenterLostFocus;
+
+            _editingContentPresenter = e.NameScope.Find<ContentPresenter>("PART_EditingContentPresenter");
+
+            if (_editingContentPresenter is not null)
+            {
+                _editingContentPresenter.UpdateChild();
+
+                var focus = (IInputElement?)_editingContentPresenter.GetVisualDescendants()
+                    .FirstOrDefault(x => (x as IInputElement)?.Focusable == true);
+                focus?.Focus();
+
+                _editingContentPresenter.LostFocus += EditingContentPresenterLostFocus;
+            }
+        }
+
         protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
         {
             base.OnAttachedToLogicalTree(e);
 
             if (ContentTemplate is null && DataContext is TemplateCell cell)
+            {
                 ContentTemplate = cell.GetCellTemplate(this);
+                EditingTemplate = cell.GetCellEditingTemplate?.Invoke(this);
+            }
         }
 
         protected override void OnDataContextChanged(EventArgs e)
@@ -70,12 +113,41 @@ protected override void OnDataContextChanged(EventArgs e)
                 Content = cell.Value;
 
                 if (((ILogical)this).IsAttachedToLogicalTree)
+                {
                     ContentTemplate = cell.GetCellTemplate(this);
+                    EditingTemplate = cell.GetCellEditingTemplate?.Invoke(this);
+                }
             }
             else
             {
                 Content = null;
             }
         }
+
+        protected override void OnLostFocus(RoutedEventArgs e) => EndEditIfFocusLost();
+        private void EditingContentPresenterLostFocus(object? sender, RoutedEventArgs e) => EndEditIfFocusLost();
+
+        private void EndEditIfFocusLost()
+        {
+            if (TopLevel.GetTopLevel(this) is { } topLevel &&
+                topLevel?.FocusManager?.GetFocusedElement() is Control newFocus &&
+                !IsDescendent(newFocus))
+            {
+                EndEdit();
+            }
+        }
+
+        private bool IsDescendent(Control c)
+        {
+            if (this.IsVisualAncestorOf(c))
+                return true;
+
+            // If the control is not a direct visual descendent, then check to make sure it's not
+            // hosted in a popup that is a descendent of the cell.
+            if (TopLevel.GetTopLevel(c)?.Parent is Control host)
+                return this.IsVisualAncestorOf(host);
+
+            return false;
+        }
     }
 }
diff --git a/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTextCell.cs b/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTextCell.cs
index 426f4fbf..a63a3b9f 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTextCell.cs
+++ b/src/Avalonia.Controls.TreeDataGrid/Primitives/TreeDataGridTextCell.cs
@@ -25,7 +25,6 @@ public class TreeDataGridTextCell : TreeDataGridCell
                 o => o.Value,
                 (o, v) => o.Value = v);
 
-        private bool _canEdit;
         private string? _value;
         private TextBox? _edit;
         private TextTrimming _textTrimming = TextTrimming.CharacterEllipsis;
@@ -53,8 +52,6 @@ public string? Value
             }
         }
 
-        protected override bool CanEdit => _canEdit;
-
         public override void Realize(
             TreeDataGridElementFactory factory,
             ITreeDataGridSelectionInteraction? selection,
@@ -62,7 +59,6 @@ public override void Realize(
             int columnIndex,
             int rowIndex)
         {
-            _canEdit = model.CanEdit;
             Value = model.Value?.ToString();
             TextTrimming = (model as ITextCell)?.TextTrimming ?? TextTrimming.CharacterEllipsis;
             TextWrapping = (model as ITextCell)?.TextWrapping ?? TextWrapping.NoWrap;
@@ -80,20 +76,12 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
         {
             base.OnApplyTemplate(e);
 
-            if (_edit is not null)
-            {
-                _edit.KeyDown -= EditKeyDown;
-                _edit.LostFocus -= EditLostFocus;
-            }
-
             _edit = e.NameScope.Find<TextBox>("PART_Edit");
 
             if (_edit is not null)
             {
                 _edit.SelectAll();
                 _edit.Focus();
-                _edit.KeyDown += EditKeyDown;
-                _edit.LostFocus += EditLostFocus;
             }
         }
 
@@ -104,21 +92,5 @@ protected override void OnModelPropertyChanged(object? sender, PropertyChangedEv
             if (e.PropertyName == nameof(ITextCell.Value))
                 Value = Model?.Value?.ToString();
         }
-
-        private void EditKeyDown(object? sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Enter)
-            {
-                EndEdit();
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Escape)
-            {
-                CancelEdit();
-                e.Handled = true;
-            }
-        }
-
-        private void EditLostFocus(object? sender, RoutedEventArgs e) => EndEdit();
     }
 }
diff --git a/src/Avalonia.Controls.TreeDataGrid/Themes/FluentControls.axaml b/src/Avalonia.Controls.TreeDataGrid/Themes/FluentControls.axaml
index 2d4cfdc2..4dbbd91e 100644
--- a/src/Avalonia.Controls.TreeDataGrid/Themes/FluentControls.axaml
+++ b/src/Avalonia.Controls.TreeDataGrid/Themes/FluentControls.axaml
@@ -304,6 +304,22 @@
                           Padding="{TemplateBinding Padding}"/>
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^:editing">
+      <Setter Property="Padding" Value="4 2" />
+      <Setter Property="Template">
+        <ControlTemplate>
+          <ContentPresenter Name="PART_EditingContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            ContentTemplate="{TemplateBinding EditingTemplate}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            Content="{TemplateBinding Content}"
+                            Padding="{TemplateBinding Padding}"/>
+        </ControlTemplate>
+      </Setter>
+    </Style>
   </ControlTheme>
 
 </ResourceDictionary>