diff --git a/src/utils.js b/src/utils.js
index 25cfe6ad33..84ccb230b9 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -369,7 +369,9 @@ export function allowAdditionalItems(schema) {
 export function optionsList(schema) {
   if (schema.enum) {
     return schema.enum.map((value, i) => {
-      const label = (schema.enumNames && schema.enumNames[i]) || String(value);
+      const label = (schema.enumNames && schema.enumNames[i]) || 
+                    (schema["x-enumNames"] && schema["x-enumNames"][i]) || 
+                    String(value);
       return { label, value };
     });
   } else {