diff --git a/Source/Editor/Modules/WindowsModule.cs b/Source/Editor/Modules/WindowsModule.cs
index 63b01bdcf..034eb1dbc 100644
--- a/Source/Editor/Modules/WindowsModule.cs
+++ b/Source/Editor/Modules/WindowsModule.cs
@@ -838,8 +838,6 @@ namespace FlaxEditor.Modules
             // risk of interrupting the user's workflow by potentially selecting
             // background tabs.
             var window = win.RootWindow?.Window;
-            if (window == null)
-                return;
             var panel = win.ParentDockPanel;
             winData.SelectOnShow = panel.SelectedTab == win;
             winData.DockedTabIndex = 0;
@@ -946,6 +944,7 @@ namespace FlaxEditor.Modules
                             win.ParentDockPanel.MoveTabRight(currentTabIndex);
                             currentTabIndex++;
                         }
+                        panel.PerformLayout(true);
                     }
                     else
                     {
diff --git a/Source/Editor/Windows/Assets/AssetEditorWindow.cs b/Source/Editor/Windows/Assets/AssetEditorWindow.cs
index 12aeb50a7..8d2c81b7f 100644
--- a/Source/Editor/Windows/Assets/AssetEditorWindow.cs
+++ b/Source/Editor/Windows/Assets/AssetEditorWindow.cs
@@ -141,6 +141,8 @@ namespace FlaxEditor.Windows.Assets
         /// <inheritdoc />
         protected override void OnClose()
         {
+            ScriptsBuilder.ScriptsReloadBegin -= OnScriptsReloadBegin;
+
             if (_item != null)
             {
                 // Ensure to remove linkage to the item
@@ -170,6 +172,7 @@ namespace FlaxEditor.Windows.Assets
             if (!IsHidden)
             {
                 Editor.Instance.Windows.AddToRestore(this);
+                Close();
             }
         }
 
diff --git a/Source/Engine/UI/GUI/Control.cs b/Source/Engine/UI/GUI/Control.cs
index f1a3c2b18..3ef604323 100644
--- a/Source/Engine/UI/GUI/Control.cs
+++ b/Source/Engine/UI/GUI/Control.cs
@@ -424,7 +424,7 @@ namespace FlaxEngine.GUI
 
         private void OnUpdateTooltip(float deltaTime)
         {
-            Tooltip.OnMouseOverControl(this, deltaTime);
+            Tooltip?.OnMouseOverControl(this, deltaTime);
         }
 
         /// <summary>
@@ -742,7 +742,7 @@ namespace FlaxEngine.GUI
             // Update tooltip
             if (ShowTooltip && OnTestTooltipOverControl(ref location))
             {
-                Tooltip.OnMouseEnterControl(this);
+                Tooltip?.OnMouseEnterControl(this);
                 SetUpdate(ref _tooltipUpdate, OnUpdateTooltip);
             }
         }
@@ -759,14 +759,14 @@ namespace FlaxEngine.GUI
             {
                 if (_tooltipUpdate == null)
                 {
-                    Tooltip.OnMouseEnterControl(this);
+                    Tooltip?.OnMouseEnterControl(this);
                     SetUpdate(ref _tooltipUpdate, OnUpdateTooltip);
                 }
             }
             else if (_tooltipUpdate != null)
             {
                 SetUpdate(ref _tooltipUpdate, null);
-                Tooltip.OnMouseLeaveControl(this);
+                Tooltip?.OnMouseLeaveControl(this);
             }
         }