diff --git a/src/Engine/Editor/EditorSystem.cpp b/src/Engine/Editor/EditorSystem.cpp
index 6d3dff3d..b5e527f0 100644
--- a/src/Engine/Editor/EditorSystem.cpp
+++ b/src/Engine/Editor/EditorSystem.cpp
@@ -492,7 +492,8 @@ void EditorSystem::drawUI(World* world, double dt)
                         const std::string& fieldName = kv.first;
                         auto& field = kv.second;
                         
-                        ImGui::PushID(fieldName.c_str());
+                        std::string uniqueID = componentType + fieldName;
+                        ImGui::PushID(uniqueID.c_str());
                         if (field.Type == "Vector") {
                             auto& val = component.Property<glm::vec3>(fieldName);
                             if (fieldName == "Scale") {