diff --git a/Source/Editor/Windows/Assets/JsonAssetWindow.cs b/Source/Editor/Windows/Assets/JsonAssetWindow.cs
index 18d130bb1..8c7183b9b 100644
--- a/Source/Editor/Windows/Assets/JsonAssetWindow.cs
+++ b/Source/Editor/Windows/Assets/JsonAssetWindow.cs
@@ -36,6 +36,7 @@ namespace FlaxEditor.Windows.Assets
             _undo = new Undo();
             _undo.UndoDone += OnUndoRedo;
             _undo.RedoDone += OnUndoRedo;
+            _undo.ActionDone += OnUndoRedo;
 
             // Toolstrip
             _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save64, Save).LinkTooltip("Save");
diff --git a/Source/Editor/Windows/Assets/LocalizedStringTableWindow.cs b/Source/Editor/Windows/Assets/LocalizedStringTableWindow.cs
index 633df8197..e4a772a5d 100644
--- a/Source/Editor/Windows/Assets/LocalizedStringTableWindow.cs
+++ b/Source/Editor/Windows/Assets/LocalizedStringTableWindow.cs
@@ -126,6 +126,7 @@ namespace FlaxEditor.Windows.Assets
             _undo = new Undo();
             _undo.UndoDone += OnUndoRedo;
             _undo.RedoDone += OnUndoRedo;
+            _undo.ActionDone += OnUndoRedo;
 
             // Toolstrip
             _saveButton = (ToolStripButton)_toolstrip.AddButton(editor.Icons.Save64, Save).LinkTooltip("Save");
diff --git a/Source/Engine/Navigation/NavigationSettings.cs b/Source/Engine/Navigation/NavigationSettings.cs
index bfd2b5381..d284637c9 100644
--- a/Source/Engine/Navigation/NavigationSettings.cs
+++ b/Source/Engine/Navigation/NavigationSettings.cs
@@ -57,7 +57,7 @@ namespace FlaxEditor.Content.Settings
         }
 
         // [Deprecated on 12.01.2021, expires on 12.01.2022]
-        [Serialize, Obsolete]
+        [Serialize, Obsolete, NoUndo]
         private float WalkableRadius
         {
             get => throw new Exception();
@@ -69,7 +69,7 @@ namespace FlaxEditor.Content.Settings
         }
 
         // [Deprecated on 12.01.2021, expires on 12.01.2022]
-        [Serialize, Obsolete]
+        [Serialize, Obsolete, NoUndo]
         private float WalkableHeight
         {
             get => throw new Exception();
@@ -81,7 +81,7 @@ namespace FlaxEditor.Content.Settings
         }
 
         // [Deprecated on 12.01.2021, expires on 12.01.2022]
-        [Serialize, Obsolete]
+        [Serialize, Obsolete, NoUndo]
         private float WalkableMaxClimb
         {
             get => throw new Exception();
@@ -93,7 +93,7 @@ namespace FlaxEditor.Content.Settings
         }
 
         // [Deprecated on 12.01.2021, expires on 12.01.2022]
-        [Serialize, Obsolete]
+        [Serialize, Obsolete, NoUndo]
         private float WalkableMaxSlopeAngle
         {
             get => throw new Exception();
diff --git a/Source/Engine/Particles/Particles.cpp b/Source/Engine/Particles/Particles.cpp
index 2c8c5d347..9b4bf66a5 100644
--- a/Source/Engine/Particles/Particles.cpp
+++ b/Source/Engine/Particles/Particles.cpp
@@ -143,7 +143,6 @@ ParticleManagerService ParticleManagerServiceInstance;
 
 void Particles::UpdateEffect(ParticleEffect* effect)
 {
-    ASSERT_LOW_LAYER(!UpdateList.Contains(effect));
     UpdateList.Add(effect);
 }