diff --git a/src/Eto.Wpf/Forms/Controls/TextBoxHandler.cs b/src/Eto.Wpf/Forms/Controls/TextBoxHandler.cs
index 6c62a59d3..27bc60cd0 100755
--- a/src/Eto.Wpf/Forms/Controls/TextBoxHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/TextBoxHandler.cs
@@ -304,7 +304,11 @@ public string Text
 					var args = new TextChangingEventArgs(oldText, newText, false);
 					Callback.OnTextChanging(Widget, args);
 					if (args.Cancel)
+					{
+						TextBox.EndChange();
 						return;
+					}
+
 					var needsTextChanged = TextBox.Text == newText;
 
 					// Improve performance when setting text often