diff --git a/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs b/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs
index 851751ff5..7d6c4f7bd 100755
--- a/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/TreeGridViewHandler.cs
@@ -22,7 +22,7 @@ protected override void Initialize()
 
 		private void Control_PreviewKeyDown(object sender, sw.Input.KeyEventArgs e)
 		{
-			if (e.Handled || swi.Keyboard.Modifiers != swi.ModifierKeys.None)
+			if (e.Handled || swi.Keyboard.Modifiers != swi.ModifierKeys.None || IsEditing)
 				return;
 
 			// handle expanding/collapsing via the keyboard