diff --git a/com.unity.toonshader/Editor/Scripts/GUI/UnityToon3Das2DGUI.cs b/com.unity.toonshader/Editor/Scripts/GUI/UnityToon3Das2DGUI.cs
index 4106b1a47..e316c6433 100644
--- a/com.unity.toonshader/Editor/Scripts/GUI/UnityToon3Das2DGUI.cs
+++ b/com.unity.toonshader/Editor/Scripts/GUI/UnityToon3Das2DGUI.cs
@@ -152,7 +152,7 @@ static void DrawLightingGUI(MaterialEditor mEditor, Material[] mats,
         ToonEditorGUIUtility.DrawVector3FieldGUI(mEditor, mats, uiElements[ToonConstants.SHADER_PROP_DIRECTIONAL_LIGHT_VIEW_POSITION]);
         ToonEditorGUIUtility.DrawTexturePropertySingleLineGUI(mEditor, uiElements[ToonConstants.SHADER_PROP_HIGHLIGHT_TEX]);
         ToonEditorGUIUtility.DrawIntPopupGUI(mEditor, mats, uiElements[ToonConstants.SHADER_PROP_DIRECTIONAL_LIGHT_HIGHLIGHT_MODE],
-            m_highlightModeEnums, m_highlightModeIndices, out int _);
+            m_highlightModeEnums, m_highlightModeValues, out int _);
         ToonEditorGUIUtility.DrawRangePropertyGUI(mEditor, uiElements[ToonConstants.SHADER_PROP_DIRECTIONAL_LIGHT_HIGHLIGHT_STRENGTH]);
         ToonEditorGUIUtility.DrawRangePropertyGUI(mEditor, uiElements[ToonConstants.SHADER_PROP_DIRECTIONAL_LIGHT_HIGHLIGHT_SIZE]);
 
@@ -193,7 +193,7 @@ static void DrawOutlineGUI(MaterialEditor mEditor, Material[] mats, Dictionary<s
         EditorGUI.BeginDisabledGroup(!state.useOutline);
 
         ToonEditorGUIUtility.DrawIntPopupGUI(mEditor, mats, uiElements[ToonConstants.SHADER_PROP_OUTLINE_MODE],
-            m_outlineModeEnums, m_outlineModeIndices, out int outlineMode);
+            m_outlineModeEnums, m_outlineModeValues, out int outlineMode);
 
         state.outlineMode = (ToonOutlineMode) outlineMode;
 
@@ -546,10 +546,10 @@ internal enum HighlightMode {
     }
 
     private static readonly GUIContent[] m_outlineModeEnums = ToonEnumUtility.ToInspectorNamesAsGUIContent(typeof(ToonOutlineMode));
-    private static readonly int[] m_outlineModeIndices = ToonEnumUtility.ToIndices(typeof(ToonOutlineMode));
+    private static readonly int[] m_outlineModeValues = ToonEnumUtility.ToIntValues(typeof(ToonOutlineMode));
 
     private static readonly GUIContent[] m_highlightModeEnums = ToonEnumUtility.ToInspectorNamesAsGUIContent(typeof(HighlightMode));
-    private static readonly int[] m_highlightModeIndices = ToonEnumUtility.ToIndices(typeof(HighlightMode));
+    private static readonly int[] m_highlightModeValues = ToonEnumUtility.ToIntValues(typeof(HighlightMode));
 
     static readonly GUIContent COLORS_FOLDOUT = EditorGUIUtility.TrTextContent("Colors",
         "Colors for basic cel-shading settings in Unity Toon Shader.");
diff --git a/com.unity.toonshader/Runtime/Scripts/Utilities/ToonEnumUtility.cs b/com.unity.toonshader/Runtime/Scripts/Utilities/ToonEnumUtility.cs
index 337729663..6c9fb85cc 100644
--- a/com.unity.toonshader/Runtime/Scripts/Utilities/ToonEnumUtility.cs
+++ b/com.unity.toonshader/Runtime/Scripts/Utilities/ToonEnumUtility.cs
@@ -1,6 +1,5 @@
 
 using System;
-using System.Collections.Generic;
 using System.Reflection;
 using UnityEngine;
 
@@ -8,34 +7,25 @@ namespace Unity.Rendering.Toon {
 
 internal static class ToonEnumUtility {
     internal static GUIContent[] ToInspectorNamesAsGUIContent(Type t) {
-        MemberInfo[] members = t.GetMembers(BindingFlags.Static | BindingFlags.Public);
-
-        int numMembers = members.Length;
-        GUIContent[] ret = new GUIContent[numMembers];
-        for (int i = 0; i < numMembers; i++) {
-            InspectorNameAttribute inspectorNameAttribute = (InspectorNameAttribute)Attribute.GetCustomAttribute(
-                members[i], typeof(InspectorNameAttribute));
-            if (inspectorNameAttribute == null) {
-                ret[i] = new GUIContent(members[i].Name);
-            } else {
-                ret[i] = new GUIContent(inspectorNameAttribute.displayName);
-            }
+        string[] names = Enum.GetNames(t);
+        GUIContent[] ret = new GUIContent[names.Length];
+        for (int i = 0; i < names.Length; i++) {
+            FieldInfo field = t.GetField(names[i], BindingFlags.Public | BindingFlags.Static);
+            InspectorNameAttribute attr = field != null
+                ? (InspectorNameAttribute)Attribute.GetCustomAttribute(field, typeof(InspectorNameAttribute))
+                : null;
+            ret[i] = new GUIContent(attr != null ? attr.displayName : names[i]);
         }
-
         return ret;
     }
 
-    internal static int[] ToIndices(Type t) {
-
-        MemberInfo[] members = t.GetMembers(BindingFlags.Static | BindingFlags.Public);
-        int numMembers = members.Length;
-        int[] indices = new int[numMembers];
-        for (int i = 0; i < numMembers; ++i) {
-            indices[i] = i;
-        }
-
-        return indices;
-
+    internal static int[] ToIntValues(Type t) {
+        Array values = Enum.GetValues(t);
+        int numValues = values.Length;
+        int[] intValues = new int[numValues];
+        for (int i = 0; i < numValues; i++)
+            intValues[i] = Convert.ToInt32(values.GetValue(i));
+        return intValues;
     }
 
 }
diff --git a/com.unity.toonshader/Tests/Runtime/Scripts/ToonEnumUtilityTests.cs b/com.unity.toonshader/Tests/Runtime/Scripts/ToonEnumUtilityTests.cs
index fad547c64..b0589df0c 100644
--- a/com.unity.toonshader/Tests/Runtime/Scripts/ToonEnumUtilityTests.cs
+++ b/com.unity.toonshader/Tests/Runtime/Scripts/ToonEnumUtilityTests.cs
@@ -13,6 +13,13 @@ internal enum DummyEnum {
         Second
     }
 
+    // Declared out of numeric order to verify results are sorted by value, not declaration order.
+    internal enum NonSequentialEnum {
+        High = 20,
+        Low = 5,
+        Mid = 10,
+    }
+
     [Test]
     public void ToInspectorNamesAsGUIContentTest() {
         GUIContent[] contents = ToonEnumUtility.ToInspectorNamesAsGUIContent(typeof(DummyEnum));
@@ -22,11 +29,28 @@ public void ToInspectorNamesAsGUIContentTest() {
     }
 
     [Test]
-    public void ToIndicesTest() {
-        int[] indices = ToonEnumUtility.ToIndices(typeof(DummyEnum));
-        Assert.AreEqual(2, indices.Length);
-        Assert.AreEqual(0, indices[0]);
-        Assert.AreEqual(1, indices[1]);
+    public void ToIntValuesTest() {
+        int[] values = ToonEnumUtility.ToIntValues(typeof(DummyEnum));
+        Assert.AreEqual(2, values.Length);
+        Assert.AreEqual(0, values[0]);
+        Assert.AreEqual(1, values[1]);
+    }
+
+    [Test]
+    public void NonSequentialEnumNamesAndValuesAreAlignedAndSortedTest() {
+        GUIContent[] contents = ToonEnumUtility.ToInspectorNamesAsGUIContent(typeof(NonSequentialEnum));
+        int[] values = ToonEnumUtility.ToIntValues(typeof(NonSequentialEnum));
+
+        Assert.AreEqual(3, contents.Length);
+        Assert.AreEqual(3, values.Length);
+
+        Assert.AreEqual("Low", contents[0].text);
+        Assert.AreEqual("Mid", contents[1].text);
+        Assert.AreEqual("High", contents[2].text);
+
+        Assert.AreEqual(5, values[0]);
+        Assert.AreEqual(10, values[1]);
+        Assert.AreEqual(20, values[2]);
     }
 
     const string FIRST_VALUE = "First Value";