diff --git a/src/mssh-pref.c b/src/mssh-pref.c
index 8b874d3..9185ec0 100644
--- a/src/mssh-pref.c
+++ b/src/mssh-pref.c
@@ -31,7 +31,7 @@ static void mssh_pref_font_select(GtkWidget *widget, gpointer data)
 
     client = gconf_client_get_default();
 
-    font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget));
+    font = gtk_font_chooser_get_font (GTK_FONT_CHOOSER(widget));
 
     gconf_client_set_string(client, MSSH_GCONF_KEY_FONT, font, NULL);
 }
@@ -383,7 +383,7 @@ static void mssh_pref_init(MSSHPref* pref)
     entry = gconf_client_get_entry(client, MSSH_GCONF_KEY_FONT, NULL,
         TRUE, NULL);
     value = gconf_entry_get_value(entry);
-    gtk_font_button_set_font_name(GTK_FONT_BUTTON(font_select),
+    gtk_font_chooser_set_font(GTK_FONT_CHOOSER(font_select),
         gconf_value_get_string(value));
 
     entry = gconf_client_get_entry(client, MSSH_GCONF_KEY_FG_COLOUR, NULL,