Index: sysSettings.cpp
===================================================================
RCS file: /projects/pgadmin3/src/utils/sysSettings.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lsrc/utils/sysSettings.cpp -Lsrc/utils/sysSettings.cpp -u -w -r1.61 -r1.62
--- src/utils/sysSettings.cpp
+++ src/utils/sysSettings.cpp
@@ -86,11 +86,17 @@
     else
         systemFont = wxFont(fontName);
 
+    Read(wxT("frmQuery/Font"), &fontName, wxEmptyString);
+
+    if (fontName.IsEmpty())
+    {
 #ifdef __WXMSW__
-    Read(wxT("frmQuery/FontFace"), &fontName, wxT("Courier New.9"));
+        sqlFont = wxFont(9, wxTELETYPE, wxNORMAL, wxNORMAL);
 #else
-    Read(wxT("frmQuery/Font"), &fontName, wxT("monospace 12"));
+        sqlFont = wxFont(12, wxTELETYPE, wxNORMAL, wxNORMAL);
 #endif
+    }
+    else
 	sqlFont = wxFont(fontName);
 }