diff --git a/studio/data/entity-types/entity-types-infinite-query.ts b/studio/data/entity-types/entity-types-infinite-query.ts
index c696e64444e..d1e304e810f 100644
--- a/studio/data/entity-types/entity-types-infinite-query.ts
+++ b/studio/data/entity-types/entity-types-infinite-query.ts
@@ -54,7 +54,7 @@ export async function getEntityTypes(
         )
         and nc.nspname = '${schema}'
         ${search ? `and c.relname ilike '%${search}%'` : ''}
-      order by "name" asc
+      order by c.relkind asc, c.relname asc
       limit ${limit}
       offset ${page * limit}
     )