diff --git a/src/Files.App/Services/Settings/FoldersSettingsService.cs b/src/Files.App/Services/Settings/FoldersSettingsService.cs
index c65b970d256d..b92d9d3fd027 100644
--- a/src/Files.App/Services/Settings/FoldersSettingsService.cs
+++ b/src/Files.App/Services/Settings/FoldersSettingsService.cs
@@ -297,6 +297,12 @@ public bool OpenFoldersInNewTab
 			set => Set(value);
 		}
 
+		public bool ScrollToParentFolderWhenNavigatingUp
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
 		public bool CalculateFolderSizes
 		{
 			get => Get(false);
@@ -421,6 +427,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(OpenItemsWithOneClick):
 				case nameof(ColumnLayoutOpenFoldersWithOneClick):
 				case nameof(OpenFoldersInNewTab):
+				case nameof(ScrollToParentFolderWhenNavigatingUp):
 				case nameof(CalculateFolderSizes):
 				case nameof(ShowFileExtensions):
 				case nameof(ShowThumbnails):
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index dd5547a64ba6..6bdba25ea132 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -3034,7 +3034,7 @@
   <data name="GroupByDateCreatedYearDescription" xml:space="preserve">
     <value>Group items by year of date created</value>
   </data>
-    <data name="GroupByDateDeletedDayDescription" xml:space="preserve">
+  <data name="GroupByDateDeletedDayDescription" xml:space="preserve">
     <value>Group items by day of date deleted</value>
   </data>
   <data name="GroupByDateDeletedMonthDescription" xml:space="preserve">
@@ -3695,4 +3695,7 @@
   <data name="FaildToShareItems" xml:space="preserve">
     <value>Failed to share items</value>
   </data>
+  <data name="ScrollToParentFolderWhenNavigatingUp" xml:space="preserve">
+    <value>Scroll to parent folder when navigating up</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Files.App/ViewModels/Settings/FoldersViewModel.cs b/src/Files.App/ViewModels/Settings/FoldersViewModel.cs
index f7606e93bdd6..fa2e4e7c8453 100644
--- a/src/Files.App/ViewModels/Settings/FoldersViewModel.cs
+++ b/src/Files.App/ViewModels/Settings/FoldersViewModel.cs
@@ -338,6 +338,20 @@ public bool CalculateFolderSizes
 			}
 		}
 
+		public bool ScrollToParentFolderWhenNavigatingUp
+		{
+			get => UserSettingsService.FoldersSettingsService.ScrollToParentFolderWhenNavigatingUp;
+			set
+			{
+				if (value != UserSettingsService.FoldersSettingsService.ScrollToParentFolderWhenNavigatingUp)
+				{
+					UserSettingsService.FoldersSettingsService.ScrollToParentFolderWhenNavigatingUp = value;
+
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		private int selectedDefaultSortingIndex;
 		public int SelectedDefaultSortingIndex
 		{
diff --git a/src/Files.App/Views/Settings/FoldersPage.xaml b/src/Files.App/Views/Settings/FoldersPage.xaml
index ae5a74294d4b..5559bda09894 100644
--- a/src/Files.App/Views/Settings/FoldersPage.xaml
+++ b/src/Files.App/Views/Settings/FoldersPage.xaml
@@ -351,6 +351,18 @@
 					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 			</local:SettingsBlockControl>
 
+			<!--  Scroll to parent folder when navigating up  -->
+			<local:SettingsBlockControl Title="{helpers:ResourceString Name=ScrollToParentFolderWhenNavigatingUp}" HorizontalAlignment="Stretch">
+				<local:SettingsBlockControl.Icon>
+					<FontIcon Glyph="&#xECE7;" />
+				</local:SettingsBlockControl.Icon>
+
+				<ToggleSwitch
+					AutomationProperties.Name="{helpers:ResourceString Name=ScrollToParentFolderWhenNavigatingUp}"
+					IsOn="{x:Bind ViewModel.ScrollToParentFolderWhenNavigatingUp, Mode=TwoWay}"
+					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+			</local:SettingsBlockControl>
+
 			<!--  Calculate folder sizes  -->
 			<local:SettingsBlockControl
 				Title="{helpers:ResourceString Name=CalculateFolderSizes}"
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
index 0f5a809a2230..29ecfd9b6335 100644
--- a/src/Files.App/Views/Shells/BaseShellPage.cs
+++ b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -674,8 +674,11 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
 
 						if (itemToSelect is not null && ContentPage is not null)
 						{
-							ContentPage.ItemManipulationModel.SetSelectedItem(itemToSelect);
-							ContentPage.ItemManipulationModel.ScrollIntoView(itemToSelect);
+							if (userSettingsService.FoldersSettingsService.ScrollToParentFolderWhenNavigatingUp)
+							{
+								ContentPage.ItemManipulationModel.SetSelectedItem(itemToSelect);
+								ContentPage.ItemManipulationModel.ScrollIntoView(itemToSelect);
+							}
 						}
 					}
 					break;
diff --git a/src/Files.Core/Services/Settings/IFoldersSettingsService.cs b/src/Files.Core/Services/Settings/IFoldersSettingsService.cs
index 2bba10f773aa..19bf964e7d14 100644
--- a/src/Files.Core/Services/Settings/IFoldersSettingsService.cs
+++ b/src/Files.Core/Services/Settings/IFoldersSettingsService.cs
@@ -1,9 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Data.Enums;
-using System.ComponentModel;
-
 namespace Files.Core.Services.Settings
 {
 	public interface IFoldersSettingsService : IBaseSettingsService, INotifyPropertyChanged
@@ -203,6 +200,11 @@ public interface IFoldersSettingsService : IBaseSettingsService, INotifyProperty
 		/// </summary>
 		bool CalculateFolderSizes { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating whether or not to scroll to the parent folder when navigating up.
+		/// </summary>
+		bool ScrollToParentFolderWhenNavigatingUp { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value indicating the default sorting option.
 		/// </summary>