diff --git a/src/common/context.ts b/src/common/context.ts
index 4baf585..9795eec 100644
--- a/src/common/context.ts
+++ b/src/common/context.ts
@@ -23,13 +23,13 @@ const naturalCompare = (a: string, b: string): number => {
 const filterAttachmentFields = (properties: KintoneFormFieldProperties): KintoneFormFieldProperty.File[] => {
   return Object.values(properties)
     .filter((property) => property.type === 'FILE')
-    .sort((a, b) => naturalCompare(a.label, b.label));
+    .sort((a, b) => naturalCompare(`${a.label} (${a.code})`, `${b.label} (${b.code})`));
 };
 
 const filterLookupFields = (properties: KintoneFormFieldProperties): KintoneFormFieldProperty.Lookup[] => {
   return Object.values(properties)
     .filter((property) => 'lookup' in property)
-    .sort((a, b) => naturalCompare(a.label, b.label));
+    .sort((a, b) => naturalCompare(`${a.label} (${a.code})`, `${b.label} (${b.code})`));
 };
 
 const getFormFieldsProperties = async (appId: KintoneAppId): Promise<KintoneFormFieldProperties> => {