Index: pgadmin/schema/pgDatatype.cpp
===================================================================
--- pgadmin/schema/pgDatatype.cpp	(revision 7073)
+++ pgadmin/schema/pgDatatype.cpp	(working copy)
@@ -164,7 +164,7 @@
     else
         condition += wxT("IN ('b', 'c', 'e')");
 
-    condition += wxT("AND typname NOT IN (SELECT relname FROM pg_class WHERE relnamespace = typnamespace AND relkind != 'c') ");
+    condition += wxT("AND typname NOT IN (SELECT relname FROM pg_class c, pg_namespace n WHERE c.relnamespace = n.oid AND (nspname = 'pg_catalog' OR nspname = 'information_schema' OR (relkind != 'c' AND relkind != 'r'))) ");
 
     if (!settings->GetShowSystemObjects())
         condition += wxT(" AND nsp.nspname NOT LIKE 'information_schema'");