diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 73d734e6..7b50ac19 100644
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -1226,6 +1226,7 @@ static void fontsel_ok(GtkButton *button, gpointer data)
 	(GTK_OBJECT(button), "user-data");
     struct uctrl *uc = (struct uctrl *)fontsel->user_data;
     char *name = unifontsel_get_name(fontsel);
+    assert(name);              /* should always be ok after OK pressed */
     gtk_entry_set_text(GTK_ENTRY(uc->entry), name);
     sfree(name);
 }
diff --git a/unix/gtkfont.c b/unix/gtkfont.c
index b5c31cfa..cc655622 100644
--- a/unix/gtkfont.c
+++ b/unix/gtkfont.c
@@ -1564,6 +1564,8 @@ static void unifontsel_select_font(unifontsel_internal *fs,
     if (size_is_explicit)
 	fs->intendedsize = size;
 
+    gtk_widget_set_sensitive(fs->u.ok_button, TRUE);
+
     /*
      * Find the index of this fontinfo in the selorder list. 
      */
@@ -2270,6 +2272,8 @@ unifontsel *unifontsel_new(const char *wintitle)
     unifontsel_setup_familylist(fs);
 
     fs->selected = NULL;
+    fs->selsize = fs->intendedsize = 13;   /* random default */
+    gtk_widget_set_sensitive(fs->u.ok_button, FALSE);
 
     return (unifontsel *)fs;
 }
@@ -2349,7 +2353,8 @@ char *unifontsel_get_name(unifontsel *fontsel)
     unifontsel_internal *fs = (unifontsel_internal *)fontsel;
     char *name;
 
-    assert(fs->selected);
+    if (!fs->selected)
+	return NULL;
 
     if (fs->selected->size == 0) {
 	name = fs->selected->fontclass->scale_fontname