diff --git a/SHADE_Managed/src/Editor/Editor.cxx b/SHADE_Managed/src/Editor/Editor.cxx
index d26bd252..7648e2aa 100644
--- a/SHADE_Managed/src/Editor/Editor.cxx
+++ b/SHADE_Managed/src/Editor/Editor.cxx
@@ -174,7 +174,7 @@ namespace SHADE
             // Any List
             if (field->FieldType->IsGenericType && field->FieldType->GetGenericTypeDefinition() == System::Collections::Generic::List<int>::typeid->GetGenericTypeDefinition())
             {
-               /* System::Type^ listType = field->FieldType->GenericTypeArguments[0];
+                System::Type^ listType = field->FieldType->GenericTypeArguments[0];
                 RangeAttribute^ rangeAttrib = hasAttribute<RangeAttribute^>(field);
                 System::Collections::IList^ iList = safe_cast<System::Collections::IList^>(field->GetValue(object));
 
@@ -185,15 +185,17 @@ namespace SHADE
                 SHEditorUI::Indent();
                 for (int i = 0; i < iList->Count; ++i)
                 {
+                    SHEditorUI::PushID(i);
                     System::Object^ obj = iList[i];
-                    if (renderFieldInInspector(std::to_string(i), obj, rangeAttrib))
+                    if (renderFieldEditor(std::to_string(i), obj, rangeAttrib))
                     {
                         iList[i] = obj;
                     }
                     SHEditorUI::SameLine();
                     SHEditorUI::Button("-");
+                    SHEditorUI::PopID();
                 }
-                SHEditorUI::Unindent();*/
+                SHEditorUI::Unindent();
             }
             else
             {
diff --git a/SHADE_Managed/src/Editor/Editor.h++ b/SHADE_Managed/src/Editor/Editor.h++
index 8fbc6348..009160ce 100644
--- a/SHADE_Managed/src/Editor/Editor.h++
+++ b/SHADE_Managed/src/Editor/Editor.h++
@@ -86,11 +86,7 @@ namespace SHADE
         {
             if (object->GetType()->IsSubclassOf(Enum::typeid))
             {
-                int managedVal = safe_cast<int>(object);
-                if (renderFieldEditorInternal<int, int>(fieldName, &managedVal, fieldEditor, isHovered, rangeAttrib))
-                {
-                    object = managedVal;
-                }
+                renderEnumEditor(fieldName, object, isHovered);
                 return true;
             }
         }