diff --git a/capplets/sound/ChangeLog b/capplets/sound/ChangeLog
index 2787563df..d015d60c6 100644
--- a/capplets/sound/ChangeLog
+++ b/capplets/sound/ChangeLog
@@ -1,5 +1,8 @@
 2001-07-17  Bradford Hovinen  <hovinen@ximian.com>
 
+	* sound-properties-capplet.c (setup_dialog): Sensitize events
+	check box only if ESD is already enabled
+
 	* sound-properties.glade: Prune dialog down to the two check
 	buttons
 
diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c
index 23e65d689..a1341efc4 100644
--- a/capplets/sound/sound-properties-capplet.c
+++ b/capplets/sound/sound-properties-capplet.c
@@ -107,6 +107,8 @@ setup_dialog (GladeXML *dialog, Bonobo_PropertyBag bag)
 {
 	CREATE_PEDITOR (boolean, "enable_esd", "enable_toggle");
 	CREATE_PEDITOR (boolean, "event_sounds", "events_toggle");
+
+	bonobo_peditor_set_guard (WID ("events_toggle"), bag, "enable_esd");
 }
 
 /* get_legacy_settings