diff --git a/Source/Editor/Windows/Assets/ParticleSystemWindow.cs b/Source/Editor/Windows/Assets/ParticleSystemWindow.cs
index 55892b461..d11e39d95 100644
--- a/Source/Editor/Windows/Assets/ParticleSystemWindow.cs
+++ b/Source/Editor/Windows/Assets/ParticleSystemWindow.cs
@@ -377,13 +377,21 @@ namespace FlaxEditor.Windows.Assets
         {
             MarkAsEdited();
             UpdateToolstrip();
-            _propertiesEditor1.BuildLayoutOnUpdate();
-            _propertiesEditor2.BuildLayoutOnUpdate();
+
+            if (!_isEditingInstancedParameterValue)
+            {
+                _propertiesEditor1.BuildLayoutOnUpdate();
+                _propertiesEditor2.BuildLayoutOnUpdate();
+            }
         }
 
         private void OnTimelineModified()
         {
-            _tmpParticleSystemIsDirty = true;
+            if (!_isEditingInstancedParameterValue)
+            {
+                _tmpParticleSystemIsDirty = true;
+            }
+
             MarkAsEdited();
         }