diff --git a/Source/Editor/Content/Proxy/CollisionDataProxy.cs b/Source/Editor/Content/Proxy/CollisionDataProxy.cs
index c07873189..fbcfaad40 100644
--- a/Source/Editor/Content/Proxy/CollisionDataProxy.cs
+++ b/Source/Editor/Content/Proxy/CollisionDataProxy.cs
@@ -107,7 +107,7 @@ namespace FlaxEditor.Content
                             if (childFolderChild is BinaryAssetItem c && c.IsOfType<CollisionData>())
                             {
                                 var collisionData = FlaxEngine.Content.Load<CollisionData>(c.ID);
-                                if (collisionData && collisionData.Options.Model == model.ID || collisionData.Options.Model == Guid.Empty)
+                                if (collisionData && (collisionData.Options.Model == model.ID || collisionData.Options.Model == Guid.Empty))
                                 {
                                     Editor.Instance.Windows.ContentWin.Select(c);
                                     if (created != null)
diff --git a/Source/Editor/CustomEditors/Values/ValueContainer.cs b/Source/Editor/CustomEditors/Values/ValueContainer.cs
index 89387fe5f..00303d310 100644
--- a/Source/Editor/CustomEditors/Values/ValueContainer.cs
+++ b/Source/Editor/CustomEditors/Values/ValueContainer.cs
@@ -229,7 +229,13 @@ namespace FlaxEditor.CustomEditors
                     for (int i = 0; i < Count; i++)
                     {
                         if (!Equals(this[i], _defaultValue))
+                        {
+                            // Special case for String (null string is kind of equal to empty string from the user perspective)
+                            if (this[i] == null && _defaultValue is string defaultValueStr && defaultValueStr.Length == 0)
+                                continue;
+
                             return true;
+                        }
                     }
                 }
                 return false;