diff --git a/src/Assets/EcsRx/UnityEditor/Editor/UIAspects/ComponentUIAspect.cs b/src/Assets/EcsRx/UnityEditor/Editor/UIAspects/ComponentUIAspect.cs
index d5fc945f..4dbe2038 100644
--- a/src/Assets/EcsRx/UnityEditor/Editor/UIAspects/ComponentUIAspect.cs
+++ b/src/Assets/EcsRx/UnityEditor/Editor/UIAspects/ComponentUIAspect.cs
@@ -57,6 +57,7 @@ public static void ShowComponentProperties<T>(T component)
                 if (handler == null)
                 {
                     Debug.LogWarning("This type is not supported: " + propertyType.Name + " - In component: " + component.GetType().Name);
+                    EditorGUILayout.EndHorizontal();
                     continue;
                 }
 
@@ -71,4 +72,4 @@ public static void ShowComponentProperties<T>(T component)
          
 
     }
-}
\ No newline at end of file
+}