diff --git a/Source/Editor/Windows/SceneTreeWindow.cs b/Source/Editor/Windows/SceneTreeWindow.cs
index 78aa123ea..8f06008a5 100644
--- a/Source/Editor/Windows/SceneTreeWindow.cs
+++ b/Source/Editor/Windows/SceneTreeWindow.cs
@@ -142,9 +142,21 @@ namespace FlaxEditor.Windows
             root.TreeNode.UpdateFilter(query);
 
             _tree.UnlockChildrenRecursive();
+            
+            var nodeSelection = _tree.Selection;
+            if(nodeSelection.Count != 0)
+            {
+                var node = nodeSelection[nodeSelection.Count - 1];
+                node.Expand(true);
+            }
+
             PerformLayout();
             PerformLayout();
-            ScrollToSelectedNode();
+
+            if(nodeSelection.Count != 0)
+            {
+                ScrollToSelectedNode();
+            }
         }
 
         private void Spawn(Type type)