diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index 75ae0c1e9..9754120ce 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug  7 15:23:08 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gconf-property-editor.c (gconf_property_editor_set_prop): damn
+	it Jonathan.  Save the @#*&$@# file before committing.
+
 Mon Aug  4 14:35:22 2003  Jonathan Blandford  <jrb@redhat.com>
 
 	* gconf-property-editor.c (gconf_property_editor_init): Reset the
diff --git a/capplets/common/gconf-property-editor.c b/capplets/common/gconf-property-editor.c
index 9ad626a0b..a555b8f3d 100644
--- a/capplets/common/gconf-property-editor.c
+++ b/capplets/common/gconf-property-editor.c
@@ -255,9 +255,9 @@ gconf_property_editor_set_prop (GObject      *object,
 		client = gconf_client_get_default ();
 		cb = g_value_get_pointer (value);
 		peditor->p->callback = (GConfClientNotifyFunc) cb;
-		if (gconf_property_editor->p->handler_id != 0) {
+		if (peditor->p->handler_id != 0) {
 			gconf_client_notify_remove (client,
-						    gconf_property_editor->p->handler_id);
+						    peditor->p->handler_id);
 		}
 		peditor->p->handler_id =
 			gconf_client_notify_add (client, peditor->p->key,