diff --git a/Source/Editor/CustomEditors/Editors/TagEditor.cs b/Source/Editor/CustomEditors/Editors/TagEditor.cs
index 5b65ffad3..b95f9e722 100644
--- a/Source/Editor/CustomEditors/Editors/TagEditor.cs
+++ b/Source/Editor/CustomEditors/Editors/TagEditor.cs
@@ -260,8 +260,6 @@ namespace FlaxEditor.CustomEditors.Editors
 
                     // Reload editor window to reflect new tag
                     assetWindow?.RefreshAsset();
-                    assetWindow?.MarkAsEdited();
-                    assetWindow?.Save();
                 }
             };
             dialog.Closed += popup =>
diff --git a/Source/Editor/Windows/Assets/AssetEditorWindow.cs b/Source/Editor/Windows/Assets/AssetEditorWindow.cs
index 05a9151c2..9d06359ad 100644
--- a/Source/Editor/Windows/Assets/AssetEditorWindow.cs
+++ b/Source/Editor/Windows/Assets/AssetEditorWindow.cs
@@ -313,7 +313,14 @@ namespace FlaxEditor.Windows.Assets
         /// </summary>
         public void RefreshAsset()
         {
-            _isWaitingForLoaded = true;
+            if (_asset == null)
+                return;
+            if (!_asset.IsLoaded)
+                return;
+
+            OnAssetLoaded();
+            MarkAsEdited();
+            Save();
         }
 
         /// <summary>