diff --git a/src/Eto/Forms/Binding/Binding.helpers.cs b/src/Eto/Forms/Binding/Binding.helpers.cs
index 75af91b117..e100d81c8b 100644
--- a/src/Eto/Forms/Binding/Binding.helpers.cs
+++ b/src/Eto/Forms/Binding/Binding.helpers.cs
@@ -240,7 +240,10 @@ public static void RemovePropertyEvent(object obj, EventHandler<EventArgs> eh)
 		{
 			var helper = eh.Target as PropertyNotifyHelper;
 			if (helper != null)
+			{
+				helper.Changed -= eh;
 				helper.Unregister(obj);
+			}
 		}
 
 		/// <summary>