diff --git a/Source/Editor/Windows/ContentWindow.Navigation.cs b/Source/Editor/Windows/ContentWindow.Navigation.cs
index 4c7373aa6..265f9d524 100644
--- a/Source/Editor/Windows/ContentWindow.Navigation.cs
+++ b/Source/Editor/Windows/ContentWindow.Navigation.cs
@@ -257,6 +257,17 @@ namespace FlaxEditor.Windows
             _navigationBar.IsLayoutLocked = wasLayoutLocked;
             _navigationBar.PerformLayout();
             UpdateNavigationBarBounds();
+
+            ScrollNavigationBarToCurrentFolder();
+        }
+
+        private void ScrollNavigationBarToCurrentFolder()
+        {
+            if (_navigationBar != null && _navigationBar.ChildrenCount != 0 && _navigationBar.HScrollBar.Visible)
+            {
+                _navigationBar.HScrollBar.TargetValue = _navigationBar.HScrollBar.Maximum;
+                _navigationBar.HScrollBar.FastScroll();
+            }
         }
 
         /// <summary>
diff --git a/Source/Editor/Windows/ContentWindow.cs b/Source/Editor/Windows/ContentWindow.cs
index 5a73530bc..7014732ac 100644
--- a/Source/Editor/Windows/ContentWindow.cs
+++ b/Source/Editor/Windows/ContentWindow.cs
@@ -1774,6 +1774,14 @@ namespace FlaxEditor.Windows
             return base.OnMouseUp(location, button);
         }
 
+        /// <inheritdoc />
+        protected override void OnSizeChanged()
+        {
+            base.OnSizeChanged();
+
+            ScrollNavigationBarToCurrentFolder();
+        }
+
         /// <inheritdoc />
         protected override void PerformLayoutBeforeChildren()
         {