diff --git a/capplets/font/ChangeLog b/capplets/font/ChangeLog
index 56ae3dfd0..a376d55fc 100644
--- a/capplets/font/ChangeLog
+++ b/capplets/font/ChangeLog
@@ -1,3 +1,7 @@
+Fri May 10 19:00:25 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* main.c (DESKTOP_FONT_NAME_KEY): get it to use the right key.
+
 2002-05-08  Jody Goldberg <jody@gnome.org>
 
 	* main.c (cb_dialog_response) : new.
diff --git a/capplets/font/main.c b/capplets/font/main.c
index 7d68bd2f3..a1d14e42a 100644
--- a/capplets/font/main.c
+++ b/capplets/font/main.c
@@ -15,8 +15,7 @@
 #include "gconf-property-editor.h"
 
 #define GTK_FONT_KEY "/desktop/gnome/interface/font_name"
-#define DESKTOP_FONT_NAME_KEY "/apps/nautilus/preferences/default_font"
-#define DESKTOP_FONT_SIZE_KEY "/apps/nautilus/preferences/default_font_size"
+#define DESKTOP_FONT_KEY "/apps/nautilus/preferences/desktop_font"
 
 static GladeXML *
 create_dialog (void)
@@ -62,13 +61,9 @@ setup_dialog (GladeXML *dialog)
 		  		    WID ("application_font"),
 				    PEDITOR_FONT_COMBINED, NULL);
 
-  peditor = gconf_peditor_new_font (NULL, DESKTOP_FONT_NAME_KEY,
+  peditor = gconf_peditor_new_font (NULL, DESKTOP_FONT_KEY,
 		  		    WID ("desktop_font"),
-				    PEDITOR_FONT_NAME, NULL);
-
-  peditor = gconf_peditor_new_font (NULL, DESKTOP_FONT_SIZE_KEY,
-		  		    WID ("desktop_font"),
-				    PEDITOR_FONT_SIZE, NULL);
+				    PEDITOR_FONT_COMBINED, NULL);
 
   widget = WID ("font_dialog");
   gtk_widget_show (widget);