diff --git a/unix/GTK2.TODO b/unix/GTK2.TODO
index e5d4b38d..7b695a50 100644
--- a/unix/GTK2.TODO
+++ b/unix/GTK2.TODO
@@ -3,13 +3,6 @@ TODO for PuTTY GTK2 port before merging back into main trunk code
 
 Things to do before deciding a merge is feasible:
 
- - Although I'm still stubbornly _supporting_ X11 fonts alongside
-   Pango ones in defiance of standard GTK2 policy, it might be a
-   good idea to at least switch the default font to Pango's
-   Monospace 12, not least so that font aliases don't come up
-   selected by default. Then again, perhaps keeping fixed as the
-   default is more traditional. Hmm.
-
  - gtkcols.c is currently a minimal-work GTK2 port of my original
    GTK1 implementation. Someone should go through it and compare it
    to a real GTK2 container class, to make sure there aren't any
diff --git a/unix/gtkfont.c b/unix/gtkfont.c
index a2d8f40c..9b95cb3b 100644
--- a/unix/gtkfont.c
+++ b/unix/gtkfont.c
@@ -2304,7 +2304,8 @@ unifontsel *unifontsel_new(const char *wintitle)
     gtk_table_attach(GTK_TABLE(table), w, 0, 3, 7, 8, GTK_FILL, 0, 0, 0);
 
     assert(i == lenof(fs->filter_buttons));
-    fs->filter_flags = FONTFLAG_CLIENTSIDE | FONTFLAG_SERVERSIDE;
+    fs->filter_flags = FONTFLAG_CLIENTSIDE | FONTFLAG_SERVERSIDE |
+	FONTFLAG_SERVERALIAS;
     unifontsel_set_filter_buttons(fs);
 
     /*