diff --git a/capplets/default-applications/ChangeLog b/capplets/default-applications/ChangeLog
index 30c6217b0..2eaca7ead 100644
--- a/capplets/default-applications/ChangeLog
+++ b/capplets/default-applications/ChangeLog
@@ -1,3 +1,14 @@
+2001-07-23  Richard Hestilow  <hestilow@ximian.com>
+
+	* callbacks.c (on_radiodefeditor_toggled): Only set_selected_editor
+	if the button is enabled.
+	(on_seldefbrowser_toggled): Ditto.
+	(on_seldefview_toggled): Ditto.
+	(on_seldefterm_toggled): Ditto.
+
+	* default-application-properties.c (fill_editor_data): Fix widget
+	name typo.
+
 2001-07-20  Chema Celorio  <chema@celorio.com>
 
 	* RELEASE : 1.5.0
diff --git a/capplets/default-applications/callbacks.c b/capplets/default-applications/callbacks.c
index 84eac309f..32a3bccca 100644
--- a/capplets/default-applications/callbacks.c
+++ b/capplets/default-applications/callbacks.c
@@ -35,7 +35,8 @@ on_radiodefeditor_toggled              (GtkToggleButton *togglebutton,
         /* Editor Default */
         gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "editorselect"), a);
 
-        set_selected_editor (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "editorselect")));
+        if (a)
+		set_selected_editor (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_editor")));
 
         ecurrent_info.use_name = a;
 
@@ -102,7 +103,8 @@ on_seldefbrowser_toggled               (GtkToggleButton *togglebutton,
         /* Browser Default */
         gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "browserselect"), a);        
 
-        set_selected_browser (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "browserselect")));        
+        if (a)
+        	set_selected_browser (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_browser")));        
 
         bcurrent_info.use_name = a;
 
@@ -168,7 +170,8 @@ on_seldefview_toggled                  (GtkToggleButton *togglebutton,
         /* Help Default */
         gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "helpselect"), a);
 
-        set_selected_terminal (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "termselect")));
+        if (a)
+        	set_selected_terminal (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_term")));
 
         hcurrent_info.use_name = a;
 
@@ -233,7 +236,8 @@ on_seldefterm_toggled                  (GtkToggleButton *togglebutton,
         /* Terminal Default */
         gtk_widget_set_sensitive(gtk_object_get_data (GTK_OBJECT (capplet), "termselect"), a);
         
-        set_selected_help (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "helpselect")));
+        if (a)
+        	set_selected_help (gtk_entry_get_text (gtk_object_get_data (GTK_OBJECT(capplet), "combo_help")));
 
         tcurrent_info.use_name = a;
 
diff --git a/capplets/default-applications/default-application-properties.c b/capplets/default-applications/default-application-properties.c
index ae4a5baae..894914cd1 100644
--- a/capplets/default-applications/default-application-properties.c
+++ b/capplets/default-applications/default-application-properties.c
@@ -283,7 +283,7 @@ fill_editor_data (EditorDescription *info)
         if (info->use_name) {
                 set_combo_editor (info->name);
                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON 
-                                              (gtk_object_get_data (GTK_OBJECT (capplet), "radiodefeditorm")), 
+                                              (gtk_object_get_data (GTK_OBJECT (capplet), "radiodefeditor")), 
                                               TRUE);
         } else {
                 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON