diff --git a/Source/Editor/Windows/Assets/AssetEditorWindow.cs b/Source/Editor/Windows/Assets/AssetEditorWindow.cs
index 92c697b88..8ad655d01 100644
--- a/Source/Editor/Windows/Assets/AssetEditorWindow.cs
+++ b/Source/Editor/Windows/Assets/AssetEditorWindow.cs
@@ -430,7 +430,7 @@ namespace FlaxEditor.Windows.Assets
         /// <summary>
         /// Gets the original asset. Note: <see cref="AssetEditorWindowBase{T}.Asset"/> is the cloned asset for local editing. Use <see cref="SaveToOriginal"/> to apply changes to the original asset.
         /// </summary>
-        public T OriginalAsset => (T)FlaxEngine.Content.GetAsset(_item.ID);
+        public T OriginalAsset => (T)FlaxEngine.Content.Load(_item.ID);
 
         /// <inheritdoc />
         protected ClonedAssetEditorWindowBase(Editor editor, AssetItem item)
diff --git a/Source/Editor/Windows/Assets/SceneAnimationWindow.cs b/Source/Editor/Windows/Assets/SceneAnimationWindow.cs
index 95421585d..c18edc716 100644
--- a/Source/Editor/Windows/Assets/SceneAnimationWindow.cs
+++ b/Source/Editor/Windows/Assets/SceneAnimationWindow.cs
@@ -277,6 +277,7 @@ namespace FlaxEditor.Windows.Assets
             private readonly StagingTexture[] _stagingTextures = new StagingTexture[FrameLatency + 1];
             private RenderProgress _progress;
             private RenderEditorState _editorState;
+            private GameWindow _gameWindow;
 
             public RenderOptions Options => _options;
 
@@ -373,6 +374,9 @@ namespace FlaxEditor.Windows.Assets
                 gameWin.Viewport.Task.PostRender += OnPostRender;
                 if (!gameWin.Visible)
                     gameWin.Show();
+                else if (!gameWin.IsFocused)
+                    gameWin.Focus();
+                _gameWindow = gameWin;
                 _warmUpTimeLeft = _options.WarmUpTime;
                 _animationFrame = 0;
                 var stagingTextureDesc = GPUTextureDescription.New2D(resolution.X, resolution.Y, gameWin.Viewport.Task.Output.Format, GPUTextureFlags.None);
@@ -385,6 +389,12 @@ namespace FlaxEditor.Windows.Assets
                     _stagingTextures[i].TaskFrame = -1;
                 }
                 _player.Play();
+                if (!_player.IsPlaying)
+                {
+                    Editor.LogError("Scene Animation Player failed to start playing.");
+                    CancelRendering();
+                    return;
+                }
                 if (_warmUpTimeLeft > 0.0f)
                 {
                     // Start warmup time
@@ -438,8 +448,11 @@ namespace FlaxEditor.Windows.Assets
                     _stagingTextures[i].Texture.ReleaseGPU();
                     Object.Destroy(ref _stagingTextures[i].Texture);
                 }
-                _progress.End();
-                editor.ProgressReporting.UnregisterHandler(_progress);
+                if (_progress != null)
+                {
+                    _progress.End();
+                    editor.ProgressReporting.UnregisterHandler(_progress);
+                }
                 if (_editorState != null)
                 {
                     editor.StateMachine.GoToState(editor.StateMachine.EditingSceneState);
@@ -452,6 +465,7 @@ namespace FlaxEditor.Windows.Assets
                 gameWin.Viewport.BackgroundColor = Color.Transparent;
                 gameWin.Viewport.KeepAspectRatio = false;
                 gameWin.Viewport.Task.PostRender -= OnPostRender;
+                _gameWindow = null;
                 _isRendering = false;
                 _presenter.Panel.Enabled = true;
                 _presenter.BuildLayoutOnUpdate();
@@ -467,6 +481,11 @@ namespace FlaxEditor.Windows.Assets
                     {
                         // Render first frame
                         _player.Play();
+                        if (!_player.IsPlaying)
+                        {
+                            Editor.LogError("Scene Animation Player failed to start playing.");
+                            CancelRendering();
+                        }
                         _warmUpTimeLeft = -1;
                         _state = States.Render;
                     }
@@ -503,8 +522,7 @@ namespace FlaxEditor.Windows.Assets
 
             private void OnPostRender(GPUContext context, RenderContext renderContext)
             {
-                var gameWin = Editor.Instance.Windows.GameWin;
-                var task = gameWin.Viewport.Task;
+                var task = _gameWindow.Viewport.Task;
                 var taskFrame = task.FrameCount;
 
                 // Check all staging textures for finished GPU to CPU transfers
@@ -540,7 +558,7 @@ namespace FlaxEditor.Windows.Assets
                     ref var stagingTexture = ref _stagingTextures[textureIdx];
                     stagingTexture.AnimationFrame = _animationFrame;
                     stagingTexture.TaskFrame = taskFrame;
-                    _options.VideoOutputFormat.RenderFrame(context, ref stagingTexture, _options, gameWin.Viewport.Task.Output);
+                    _options.VideoOutputFormat.RenderFrame(context, ref stagingTexture, _options, _gameWindow.Viewport.Task.Output);
 
                     // Now wait for the next animation frame to be updated
                     _state = States.Update;
diff --git a/Source/Editor/Windows/GameWindow.cs b/Source/Editor/Windows/GameWindow.cs
index c6a3fd24c..2f9be0254 100644
--- a/Source/Editor/Windows/GameWindow.cs
+++ b/Source/Editor/Windows/GameWindow.cs
@@ -387,7 +387,6 @@ namespace FlaxEditor.Windows
             }
             }
 
-
             // Prevent closing the game window tab during a play session
             if (Editor.StateMachine.IsPlayMode && Editor.Options.Options.Input.CloseTab.Process(this, key))
             {