diff --git a/control-center/ChangeLog b/control-center/ChangeLog
index 111dbfb32..f47904eaf 100644
--- a/control-center/ChangeLog
+++ b/control-center/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-25  Richard Hestilow  <hestilow@ximian.com>
+
+	* main.c (main): Move capplet-launching code into an idle handler.
+	Bonobo sucks like that.
+
+	* capplet-dir.c (capplet_activate): Remove the check for gnomecc,
+	it was causing grief with bonobo. Story at 11.
+
 2001-07-24  Chema Celorio  <chema@celorio.com>
 
 	* capplet-dir-view-html.c (html_create): set the usize of hte
diff --git a/control-center/capplet-dir.c b/control-center/capplet-dir.c
index cecaea447..a63c17b02 100644
--- a/control-center/capplet-dir.c
+++ b/control-center/capplet-dir.c
@@ -202,9 +202,11 @@ capplet_activate (Capplet *capplet)
 	entry = CAPPLET_DIR_ENTRY (capplet)->entry;
 
 #warning FIXME: this should probably be root-manager-helper
+#if 0
 	if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc")))
 		capplet_control_launch (entry->exec[2], entry->name);
-	else if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager")))
+#endif
+	if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager")))
 		start_capplet_through_root_manager (entry);
 	else
 		gnome_desktop_entry_launch (entry);
diff --git a/control-center/main.c b/control-center/main.c
index afe872a18..7e5cbd72c 100644
--- a/control-center/main.c
+++ b/control-center/main.c
@@ -37,11 +37,26 @@
 #include "capplet-dir.h"
 #include "capplet-dir-view.h"
 
+static gint 
+real_launch_control (gchar *capplet)
+{
+	GtkWidget *app;
+	if ((app = capplet_control_launch (capplet, _("Configuraiton"))) == NULL)
+	{
+		gtk_main_quit ();
+		return FALSE;
+	}
+
+	gtk_signal_connect (GTK_OBJECT (app), "destroy",
+			    GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+
+	return FALSE;
+}
+
 int
 main (int argc, char **argv) 
 {
 	CORBA_ORB orb;
-	GtkWidget *app;
 
 	static gchar *capplet = NULL;
 	static struct poptOption gnomecc_options[] = {
@@ -78,11 +93,7 @@ main (int argc, char **argv)
 			return -1;
 		capplet_dir_entry_activate (entry, NULL);
 	} else {
-		if ((app = capplet_control_launch (capplet, _("Configuraiton"))) == NULL)
-			return -1;
-
-		gtk_signal_connect (GTK_OBJECT (app), "destroy",
-				    GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+		gtk_idle_add ((GtkFunction) real_launch_control, capplet);
 	}
 
 	bonobo_main ();