diff --git a/src/qqq/pages/entity-list/index.tsx b/src/qqq/pages/entity-list/index.tsx
index b8c062e..879faae 100644
--- a/src/qqq/pages/entity-list/index.tsx
+++ b/src/qqq/pages/entity-list/index.tsx
@@ -265,7 +265,17 @@ function EntityList({table}: Props): JSX.Element
             rows.push(row);
          });
 
-         const sortedKeys = [...tableMetaData.fields.keys()].sort();
+         const sortedKeys: string[] = [];
+
+         for (let i = 0; i < tableMetaData.sections.length; i++)
+         {
+            const section = tableMetaData.sections[i];
+            for (let j = 0; j < section.fieldNames.length; j++)
+            {
+               sortedKeys.push(section.fieldNames[j]);
+            }
+         }
+
          sortedKeys.forEach((key) =>
          {
             const field = tableMetaData.fields.get(key);