From ccded56639a3f283bfae12c87274f89e93fa1f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Garc=C3=ADa=20Ruiz?= <pgruiz727@gmail.com>
Date: Sat, 4 Feb 2023 16:58:42 +0100
Subject: [PATCH 1/6] Add recent items widget

---
 .../NavigationControlItems/LocationItem.cs    |   1 +
 .../DataModels/SidebarPinnedModel.cs          |  19 +-
 .../Filesystem/QuickAccessManager.cs          |   2 +
 .../QuickAccessService.cs                     |  19 +-
 src/Files.App/Strings/en-US/Resources.resw    |   3 +
 .../UserControls/Widgets/FolderWidget.xaml    |  90 ++++++----
 .../UserControls/Widgets/FolderWidget.xaml.cs | 165 ++++++++++++------
 src/Files.App/ViewModels/ToolbarViewModel.cs  |   5 +
 src/Files.App/Views/WidgetsPage.xaml.cs       |  31 ++--
 .../Services/IQuickAccessService.cs           |   2 +-
 10 files changed, 229 insertions(+), 108 deletions(-)

diff --git a/src/Files.App/DataModels/NavigationControlItems/LocationItem.cs b/src/Files.App/DataModels/NavigationControlItems/LocationItem.cs
index 2ad2908b9cee..c55ba6506064 100644
--- a/src/Files.App/DataModels/NavigationControlItems/LocationItem.cs
+++ b/src/Files.App/DataModels/NavigationControlItems/LocationItem.cs
@@ -56,6 +56,7 @@ public bool IsExpanded
 
 		public bool IsInvalid { get; set; } = false;
 
+		public bool IsPinned => App.QuickAccessManager.Model.FavoriteItems.Contains(path);
 		public SectionType Section { get; set; }
 
 		public ContextMenuOptions MenuOptions { get; set; }
diff --git a/src/Files.App/DataModels/SidebarPinnedModel.cs b/src/Files.App/DataModels/SidebarPinnedModel.cs
index 209c27cd3864..477551e8ebbb 100644
--- a/src/Files.App/DataModels/SidebarPinnedModel.cs
+++ b/src/Files.App/DataModels/SidebarPinnedModel.cs
@@ -75,12 +75,7 @@ public int IndexOfItem(INavigationControlItem locationItem)
 			}
 		}
 
-		/// <summary>
-		/// Adds the item (from a path) to the navigation sidebar
-		/// </summary>
-		/// <param name="path">The path which to save</param>
-		/// <returns>Task</returns>
-		public async Task AddItemToSidebarAsync(string path)
+		public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
 		{
 			var item = await FilesystemTasks.Wrap(() => DrivesManager.GetRootFromPathAsync(path));
 			var res = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderFromPathAsync(path, item));
@@ -130,6 +125,18 @@ public async Task AddItemToSidebarAsync(string path)
 				Debug.WriteLine($"Pinned item was invalid {res.ErrorCode}, item: {path}");
 			}
 
+			return locationItem;
+		}
+
+		/// <summary>
+		/// Adds the item (from a path) to the navigation sidebar
+		/// </summary>
+		/// <param name="path">The path which to save</param>
+		/// <returns>Task</returns>
+		public async Task AddItemToSidebarAsync(string path)
+		{
+			var locationItem = await CreateLocationItemFromPathAsync(path);
+			
 			AddLocationItemToSidebar(locationItem);
 		}
 
diff --git a/src/Files.App/Filesystem/QuickAccessManager.cs b/src/Files.App/Filesystem/QuickAccessManager.cs
index 543a01e4608e..dff0e36139fb 100644
--- a/src/Files.App/Filesystem/QuickAccessManager.cs
+++ b/src/Files.App/Filesystem/QuickAccessManager.cs
@@ -1,6 +1,7 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Files.App.DataModels;
 using Files.App.ServicesImplementation;
+using Files.App.UserControls.Widgets;
 using Files.Shared.Extensions;
 using System;
 using System.Collections.Generic;
@@ -17,6 +18,7 @@ public sealed class QuickAccessManager
 	{
 		public FileSystemWatcher? PinnedItemsWatcher;
 		public event FileSystemEventHandler? PinnedItemsModified;
+		public EventHandler<ModifyQuickAccessEventArgs>? UpdateFolderWidget;
 		public IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService<IQuickAccessService>();
 
 		public SidebarPinnedModel Model;
diff --git a/src/Files.App/ServicesImplementation/QuickAccessService.cs b/src/Files.App/ServicesImplementation/QuickAccessService.cs
index 5b9e48ecda4a..554114c719c9 100644
--- a/src/Files.App/ServicesImplementation/QuickAccessService.cs
+++ b/src/Files.App/ServicesImplementation/QuickAccessService.cs
@@ -1,8 +1,13 @@
-using Files.App.Shell;
+using Files.App.DataModels.NavigationControlItems;
+using Files.App.Filesystem;
+using Files.App.Shell;
+using Files.App.UserControls.Widgets;
+using Files.Shared;
 using Files.Shared.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Permissions;
 using System.Threading.Tasks;
 
 namespace Files.App.ServicesImplementation
@@ -10,19 +15,19 @@ namespace Files.App.ServicesImplementation
 	internal class QuickAccessService : IQuickAccessService
 	{
 		private readonly static string guid = "::{679f85cb-0220-4080-b29b-5540cc05aab6}";
-		
-		public async Task<List<string>> GetPinnedFoldersAsync()
+
+		public async Task<List<string>> GetPinnedFoldersAsync(bool getRecentItems = false)
 		{
 			var sidebarItems =  (await Win32Shell.GetShellFolderAsync(guid, "Enumerate", 0, 10000)).Enumerate
 				.Where(link => link.IsFolder)
 				.Select(link => link.FilePath).ToList();
 
-			if (sidebarItems.Count > 4) // Avoid first opening crash #11139
+			if (sidebarItems.Count > 4 && !getRecentItems) // Avoid first opening crash #11139
 				sidebarItems.RemoveRange(sidebarItems.Count - 4, 4); // 4 is the number of recent items shown in explorer sidebar
 			
 			return sidebarItems;
 		}
-
+		
 		public async Task PinToSidebar(string folderPath)
 			=> await PinToSidebar(new[] { folderPath });
 		
@@ -30,8 +35,9 @@ public async Task PinToSidebar(string[] folderPaths)
 		{
 			await ContextMenu.InvokeVerb("pintohome", folderPaths);
 			await App.QuickAccessManager.Model.LoadAsync();
+			App.QuickAccessManager.UpdateFolderWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, true));
 		}
-
+		
 		public async Task UnpinFromSidebar(string folderPath)
 			=> await UnpinFromSidebar(new[] { folderPath });
 		
@@ -48,6 +54,7 @@ await SafetyExtensions.IgnoreExceptions(async () => {
 					});
 
 			await App.QuickAccessManager.Model.LoadAsync();
+			App.QuickAccessManager.UpdateFolderWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, false));
 		}
 	}
 }
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 89c6767f81ee..24d5fc1b75b0 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -2901,4 +2901,7 @@
   <data name="DisplayEditTagsMenu" xml:space="preserve">
     <value>Display the edit tags flyout</value>
   </data>
+  <data name="QuickAccess" xml:space="preserve">
+    <value>Quick Access</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Files.App/UserControls/Widgets/FolderWidget.xaml b/src/Files.App/UserControls/Widgets/FolderWidget.xaml
index 7da6d737f348..f3f498776838 100644
--- a/src/Files.App/UserControls/Widgets/FolderWidget.xaml
+++ b/src/Files.App/UserControls/Widgets/FolderWidget.xaml
@@ -26,7 +26,7 @@
 			</ItemsRepeater.Layout>
 			<ItemsRepeater.ItemTemplate>
 				<DataTemplate x:DataType="local:FolderCardItem">
-					<Button
+                    <Button
 						Padding="8"
 						HorizontalAlignment="Stretch"
 						VerticalAlignment="Stretch"
@@ -38,63 +38,87 @@
 						CornerRadius="{StaticResource ControlCornerRadius}"
 						PointerPressed="Button_PointerPressed"
 						Tag="{x:Bind Path}">
-						<Button.ContextFlyout>
-							<MenuFlyout Opening="MenuFlyout_Opening">
-								<MenuFlyout.Items>
-									<MenuFlyoutItem
+                        <Button.ContextFlyout>
+                            <MenuFlyout Opening="MenuFlyout_Opening">
+                                <MenuFlyout.Items>
+                                    <MenuFlyoutItem
 										x:Name="OpenInNewPane"
 										x:Load="{x:Bind HasPath}"
 										Click="OpenInNewPane_Click"
 										DataContext="{x:Bind}"
 										Text="{helpers:ResourceString Name=SideBarOpenInNewPane/Text}"
 										Visibility="Collapsed">
-										<MenuFlyoutItem.Icon>
-											<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF117;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF117;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                    <MenuFlyoutItem
 										x:Name="OpenInNewTab"
 										x:Load="{x:Bind HasPath}"
 										Click="OpenInNewTab_Click"
 										DataContext="{x:Bind}"
 										Text="{helpers:ResourceString Name=SideBarOpenInNewTab/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF113;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF113;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                    <MenuFlyoutItem
 										x:Name="OpenInNewWindow"
 										x:Load="{x:Bind HasPath}"
 										Click="OpenInNewWindow_Click"
 										DataContext="{x:Bind}"
 										Text="{helpers:ResourceString Name=SideBarOpenInNewWindow/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE737;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-									<MenuFlyoutItem
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon Glyph="&#xE737;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+	                                <MenuFlyoutItem
+		                                x:Name="PinToFavorites"
+		                                Click="PinToFavorites_Click"
+		                                DataContext="{x:Bind}"
+		                                Text="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutPinToFavorites/Text}"
+		                                Visibility="Collapsed">
+		                                <MenuFlyoutItem.Icon>
+			                                <FontIcon Glyph="&#xE840;" />
+		                                </MenuFlyoutItem.Icon>
+	                                </MenuFlyoutItem>
+	                                <MenuFlyoutItem
+		                                x:Name="UnpinFromFavorites"
+		                                Click="UnpinFromFavorites_Click"
+		                                DataContext="{x:Bind}"
+		                                Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutUnpinFromFavorites/Text}"
+		                                Visibility="Collapsed">
+		                                <MenuFlyoutItem.Icon>
+			                                <FontIcon Glyph="&#xE77A;" />
+		                                </MenuFlyoutItem.Icon>
+	                                </MenuFlyoutItem>
+                                    <MenuFlyoutItem
 										x:Name="Properties"
-										x:Load="{x:Bind IsLibrary}"
-										Click="OpenLibraryProperties_Click"
+										Click="OpenProperties_Click"
 										DataContext="{x:Bind}"
 										Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutPropertiesFolder/Text}">
-										<MenuFlyoutItem.Icon>
-											<FontIcon Glyph="&#xE946;" />
-										</MenuFlyoutItem.Icon>
-									</MenuFlyoutItem>
-								</MenuFlyout.Items>
-							</MenuFlyout>
-						</Button.ContextFlyout>
-
-						<Grid
+                                        <MenuFlyoutItem.Icon>
+                                            <FontIcon Glyph="&#xE946;" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                </MenuFlyout.Items>
+                            </MenuFlyout>
+                        </Button.ContextFlyout>
+                        <Grid
 							HorizontalAlignment="Stretch"
 							VerticalAlignment="Stretch"
 							RowSpacing="0">
-							<Grid.RowDefinitions>
+                            <Grid.RowDefinitions>
 								<RowDefinition Height="*" />
 								<RowDefinition Height="Auto" />
 							</Grid.RowDefinitions>
-							<Image
+	                        <StackPanel Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right">
+		                        <FontIcon x:Name="PinIcon" 
+		                                  Glyph="&#xE840;"
+										  FontSize="14"
+		                                  Visibility="{x:Bind IsPinned}" />
+	                        </StackPanel>
+                            <Image
 								Grid.Row="0"
 								Width="32"
 								Height="32"
diff --git a/src/Files.App/UserControls/Widgets/FolderWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FolderWidget.xaml.cs
index 6b51c563530c..5fde6212d1cc 100644
--- a/src/Files.App/UserControls/Widgets/FolderWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/FolderWidget.xaml.cs
@@ -7,6 +7,7 @@
 using Files.App.Filesystem;
 using Files.App.Helpers;
 using Files.App.Helpers.XamlHelpers;
+using Files.App.ServicesImplementation;
 using Files.App.ViewModels.Widgets;
 using Files.Backend.Services.Settings;
 using Microsoft.UI.Xaml;
@@ -15,28 +16,45 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.IO;
 using System.Linq;
+using System.Net.Sockets;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using Vanara;
 using Windows.Storage;
 using Windows.System;
 using Windows.UI.Core;
 
 namespace Files.App.UserControls.Widgets
 {
-	public class LibraryCardEventArgs : EventArgs
+	public class QuickAccessCardEventArgs : EventArgs
 	{
-		public LibraryLocationItem Library { get; set; }
+		public LocationItem Item { get; set; }
 	}
 
-	public class LibraryCardInvokedEventArgs : EventArgs
+	public class QuickAccessCardInvokedEventArgs : EventArgs
 	{
 		public string Path { get; set; }
 	}
 
+	public class ModifyQuickAccessEventArgs : EventArgs
+	{
+		public string[] Paths { get; set; }
+		public bool Add;
+		public bool Pin = true;
+
+		public ModifyQuickAccessEventArgs(string[] paths, bool add)
+		{
+			Paths = paths;
+			Add = add;
+		}
+	}
+
 	public class FolderCardItem : ObservableObject, IWidgetCardItem<LocationItem>
 	{
 		private BitmapImage thumbnail;
@@ -56,18 +74,20 @@ public BitmapImage Thumbnail
 		public string Path { get; set; }
 		public ICommand SelectCommand { get; set; }
 		public string Text { get; set; }
+		public bool IsPinned { get; set; }
 
-		public FolderCardItem(LocationItem item = null, string text = null) : this(text)
+		public FolderCardItem(LocationItem item = null, string text = null, bool isPinned = true) : this(text, isPinned)
 		{
 			Item = item;
 		}
 
-		public FolderCardItem(string text)
+		public FolderCardItem(string text, bool isPinned)
 		{
 			if (!string.IsNullOrWhiteSpace(text))
 			{
 				Text = text;
 				AutomationProperties = Text;
+				IsPinned = isPinned;
 			}
 		}
 
@@ -88,6 +108,8 @@ public sealed partial class FolderWidget : UserControl, IWidgetItemModel, INotif
 	{
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
+		private readonly IQuickAccessService QuickAccessService = Ioc.Default.GetRequiredService<IQuickAccessService>();
+
 		public ObservableCollection<FolderCardItem> ItemsAdded = new();
 
 		private bool showMultiPaneControls;
@@ -96,23 +118,23 @@ public FolderWidget()
 		{
 			InitializeComponent();
 
-			LibraryCardCommand = new AsyncRelayCommand<FolderCardItem>(OpenLibraryCard);
+			QuickAccessCardCommand = new AsyncRelayCommand<FolderCardItem>(OpenCard);
 
 			Loaded += FolderWidget_Loaded;
 			Unloaded += FolderWidget_Unloaded;
 		}
 
-		public delegate void LibraryCardInvokedEventHandler(object sender, LibraryCardInvokedEventArgs e);
+		public delegate void LibraryCardInvokedEventHandler(object sender, QuickAccessCardInvokedEventArgs e);
 
-		public delegate void LibraryCardNewPaneInvokedEventHandler(object sender, LibraryCardInvokedEventArgs e);
+		public delegate void LibraryCardNewPaneInvokedEventHandler(object sender, QuickAccessCardInvokedEventArgs e);
 
-		public delegate void LibraryCardPropertiesInvokedEventHandler(object sender, LibraryCardEventArgs e);
+		public delegate void LibraryCardPropertiesInvokedEventHandler(object sender, QuickAccessCardEventArgs e);
 
-		public event LibraryCardInvokedEventHandler LibraryCardInvoked;
+		public event LibraryCardInvokedEventHandler CardInvoked;
 
-		public event LibraryCardNewPaneInvokedEventHandler LibraryCardNewPaneInvoked;
+		public event LibraryCardNewPaneInvokedEventHandler CardNewPaneInvoked;
 
-		public event LibraryCardPropertiesInvokedEventHandler LibraryCardPropertiesInvoked;
+		public event LibraryCardPropertiesInvokedEventHandler CardPropertiesInvoked;
 
 		public event EventHandler FolderWidgethowMultiPaneControlsInvoked;
 
@@ -120,7 +142,7 @@ public FolderWidget()
 
 		public bool IsWidgetSettingEnabled => UserSettingsService.PreferencesSettingsService.ShowFoldersWidget;
 
-		public ICommand LibraryCardCommand { get; }
+		public ICommand QuickAccessCardCommand { get; }
 
 		public ICommand ShowCreateNewLibraryDialogCommand { get; } = new RelayCommand(LibraryManager.ShowCreateNewLibraryDialog);
 
@@ -148,42 +170,56 @@ public bool ShowMultiPaneControls
 
 		public string AutomationProperties => "FolderWidgetAutomationProperties/Name".GetLocalizedResource();
 
-		public string WidgetHeader => "Folders".GetLocalizedResource();
+		public string WidgetHeader => "QuickAccess".GetLocalizedResource();
+
+		private async void ModifyItem(object? sender, ModifyQuickAccessEventArgs? e)
+		{
+			if (e is null)
+				return;
+
+			if (e.Add)
+			{
+				var locationItems = new List<LocationItem>();
+				foreach (var item in e.Paths)
+					locationItems.Add(await App.QuickAccessManager.Model.CreateLocationItemFromPathAsync(item));
+
+				foreach (var item in locationItems)
+					ItemsAdded.Insert(e.Pin ? ItemsAdded.Count - 4 : ItemsAdded.Count, new FolderCardItem(Path.GetFileName(item.Text), e.Pin) // Add just after the Recent Folders
+					{
+						Path = item.Path,
+						SelectCommand = QuickAccessCardCommand
+					});
+
+				var cardLoadTasks = ItemsAdded.Select(cardItem => cardItem.LoadCardThumbnailAsync());
+				await Task.WhenAll(cardLoadTasks);
+			}
+			else
+				foreach (var itemToRemove in ItemsAdded.Where(x => e.Paths.Contains(x.Path)).ToList())
+					ItemsAdded.Remove(itemToRemove);
+		}
 
 		private async void FolderWidget_Loaded(object sender, RoutedEventArgs e)
 		{
 			Loaded -= FolderWidget_Loaded;
 
-			ItemsAdded.Add(new FolderCardItem("Desktop".GetLocalizedResource())
-			{
-				Path = UserDataPaths.GetDefault().Desktop,
-				SelectCommand = LibraryCardCommand
-			});
-			ItemsAdded.Add(new FolderCardItem("Documents".GetLocalizedResource())
-			{
-				Path = UserDataPaths.GetDefault().Documents,
-				SelectCommand = LibraryCardCommand
-			});
-			ItemsAdded.Add(new FolderCardItem("Downloads".GetLocalizedResource())
-			{
-				Path = UserDataPaths.GetDefault().Downloads,
-				SelectCommand = LibraryCardCommand
-			});
-			ItemsAdded.Add(new FolderCardItem("Music".GetLocalizedResource())
-			{
-				Path = UserDataPaths.GetDefault().Music,
-				SelectCommand = LibraryCardCommand
-			});
-			ItemsAdded.Add(new FolderCardItem("Pictures".GetLocalizedResource())
-			{
-				Path = UserDataPaths.GetDefault().Pictures,
-				SelectCommand = LibraryCardCommand
-			});
-			ItemsAdded.Add(new FolderCardItem("Videos".GetLocalizedResource())
+			var itemsToAdd = await QuickAccessService.GetPinnedFoldersAsync(true);
+
+			var locationItems = new List<LocationItem>();
+			foreach (var item in itemsToAdd)
+				locationItems.Add(await App.QuickAccessManager.Model.CreateLocationItemFromPathAsync(item));
+
+			int idx = 0;
+			foreach (var item in locationItems)
 			{
-				Path = UserDataPaths.GetDefault().Videos,
-				SelectCommand = LibraryCardCommand
-			});
+				ItemsAdded.Add(new FolderCardItem(item, Path.GetFileName(item.Text), idx < locationItems.Count - 4)
+				{
+					Path = item.Path,
+					SelectCommand = QuickAccessCardCommand
+				});
+				idx++;
+			}
+
+			App.QuickAccessManager.UpdateFolderWidget += ModifyItem;
 
 			var cardLoadTasks = ItemsAdded.Select(cardItem => cardItem.LoadCardThumbnailAsync());
 			await Task.WhenAll(cardLoadTasks);
@@ -192,6 +228,7 @@ private async void FolderWidget_Loaded(object sender, RoutedEventArgs e)
 		private void FolderWidget_Unloaded(object sender, RoutedEventArgs e)
 		{
 			Unloaded -= FolderWidget_Unloaded;
+			App.QuickAccessManager.UpdateFolderWidget += ModifyItem;
 		}
 
 		private void MenuFlyout_Opening(object sender, object e)
@@ -199,9 +236,15 @@ private void MenuFlyout_Opening(object sender, object e)
 			var newPaneMenuItem = (sender as MenuFlyout).Items.SingleOrDefault(x => x.Name == "OpenInNewPane");
 			// eg. an empty library doesn't have OpenInNewPane context menu item
 			if (newPaneMenuItem is not null)
-			{
 				newPaneMenuItem.Visibility = ShowMultiPaneControls ? Visibility.Visible : Visibility.Collapsed;
-			}
+			
+			var pinToFavoritesItem = (sender as MenuFlyout).Items.SingleOrDefault(x => x.Name == "PinToFavorites");
+			if (pinToFavoritesItem is not null) 
+				pinToFavoritesItem.Visibility = (pinToFavoritesItem.DataContext as FolderCardItem).IsPinned ? Visibility.Collapsed : Visibility.Visible;
+
+			var unpinFromFavoritesItem = (sender as MenuFlyout).Items.SingleOrDefault(x => x.Name == "UnpinFromFavorites");
+			if (unpinFromFavoritesItem is not null)
+				unpinFromFavoritesItem.Visibility = (unpinFromFavoritesItem.DataContext as FolderCardItem).IsPinned ? Visibility.Visible : Visibility.Collapsed;
 		}
 
 		private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
@@ -212,7 +255,7 @@ private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
 		private void OpenInNewPane_Click(object sender, RoutedEventArgs e)
 		{
 			var item = ((MenuFlyoutItem)sender).DataContext as FolderCardItem;
-			LibraryCardNewPaneInvoked?.Invoke(this, new LibraryCardInvokedEventArgs { Path = item.Path });
+			CardNewPaneInvoked?.Invoke(this, new QuickAccessCardInvokedEventArgs { Path = item.Path });
 		}
 
 		private async void OpenInNewTab_Click(object sender, RoutedEventArgs e)
@@ -236,24 +279,44 @@ private async void OpenInNewWindow_Click(object sender, RoutedEventArgs e)
 			await NavigationHelpers.OpenPathInNewWindowAsync(item.Path);
 		}
 
-		private void OpenLibraryProperties_Click(object sender, RoutedEventArgs e)
+		private void OpenProperties_Click(object sender, RoutedEventArgs e)
 		{
 			var presenter = DependencyObjectHelpers.FindParent<MenuFlyoutPresenter>((MenuFlyoutItem)sender);
 			var flyoutParent = presenter?.Parent as Popup;
 			var propertiesItem = ((MenuFlyoutItem)sender).DataContext as FolderCardItem;
-			if (propertiesItem is null || !propertiesItem.IsLibrary || flyoutParent is null)
+			if (propertiesItem is null  || flyoutParent is null)
 				return;
 
 			EventHandler<object> flyoutClosed = null!;
 			flyoutClosed = (s, e) =>
 			{
 				flyoutParent.Closed -= flyoutClosed;
-				LibraryCardPropertiesInvoked?.Invoke(this, new LibraryCardEventArgs { Library = (propertiesItem.Item as LibraryLocationItem)! });
+				CardPropertiesInvoked?.Invoke(this, new QuickAccessCardEventArgs { Item = propertiesItem.Item });
 			};
 			flyoutParent.Closed += flyoutClosed;
 		}
 
-		private Task OpenLibraryCard(FolderCardItem item)
+		private async void PinToFavorites_Click(object sender, RoutedEventArgs e)
+		{
+			var item = ((MenuFlyoutItem)sender).DataContext as FolderCardItem;
+			await QuickAccessService.PinToSidebar(item.Path);
+			ModifyItem(this, new ModifyQuickAccessEventArgs(new[] { item.Path }, false));
+			var items = await QuickAccessService.GetPinnedFoldersAsync(true);
+			items.RemoveRange(0, items.Count - 4);
+			var recentItem = items.Where(x => !ItemsAdded.Select(y => y.Path).Contains(x)).FirstOrDefault();
+			ModifyItem(this, new ModifyQuickAccessEventArgs(new[] { recentItem }, true)
+			{
+				Pin = false
+			});
+		}
+
+		private void UnpinFromFavorites_Click(object sender, RoutedEventArgs e)
+		{
+			var item = ((MenuFlyoutItem)sender).DataContext as FolderCardItem;
+			_ = QuickAccessService.UnpinFromSidebar(item.Path);
+		}
+
+		private Task OpenCard(FolderCardItem item)
 		{
 			if (string.IsNullOrEmpty(item.Path))
 			{
@@ -271,7 +334,7 @@ private Task OpenLibraryCard(FolderCardItem item)
 				return NavigationHelpers.OpenPathInNewTab(item.Path);
 			}
 
-			LibraryCardInvoked?.Invoke(this, new LibraryCardInvokedEventArgs { Path = item.Path });
+			CardInvoked?.Invoke(this, new QuickAccessCardInvokedEventArgs { Path = item.Path });
 
 			return Task.CompletedTask;
 		}
diff --git a/src/Files.App/ViewModels/ToolbarViewModel.cs b/src/Files.App/ViewModels/ToolbarViewModel.cs
index 10ac1109e857..7047e2e12aee 100644
--- a/src/Files.App/ViewModels/ToolbarViewModel.cs
+++ b/src/Files.App/ViewModels/ToolbarViewModel.cs
@@ -436,6 +436,11 @@ public async Task CheckForReleaseNotesAsync()
 			IsReleaseNotesVisible = true;
 		}
 
+		public void RefreshWidgets()
+		{
+			RefreshWidgetsRequested?.Invoke(this, EventArgs.Empty);
+		}
+
 		private void UserSettingsService_OnSettingChangedEvent(object? sender, SettingChangedEventArgs e)
 		{
 			switch (e.SettingName)
diff --git a/src/Files.App/Views/WidgetsPage.xaml.cs b/src/Files.App/Views/WidgetsPage.xaml.cs
index bf214225f215..72a4c161063a 100644
--- a/src/Files.App/Views/WidgetsPage.xaml.cs
+++ b/src/Files.App/Views/WidgetsPage.xaml.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
+using Files.App.DataModels.NavigationControlItems;
 using Files.App.Dialogs;
 using Files.App.Extensions;
 using Files.App.Filesystem;
@@ -14,6 +15,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
+using Windows.Storage;
 
 namespace Files.App.Views
 {
@@ -58,7 +60,7 @@ private void ViewModel_WidgetListRefreshRequestedInvoked(object? sender, EventAr
 			ReloadWidgets();
 		}
 
-		private void ReloadWidgets()
+		public void ReloadWidgets()
 		{
 			folderWidget = WidgetsHelpers.TryGetWidget<FolderWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadFolderWidget, folderWidget);
 			drivesWidget = WidgetsHelpers.TryGetWidget<DrivesWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadDrivesWidget, drivesWidget);
@@ -70,13 +72,13 @@ private void ReloadWidgets()
 			{
 				Widgets.ViewModel.InsertWidget(new(folderWidget, (value) => UserSettingsService.PreferencesSettingsService.FoldersWidgetExpanded = value, () => UserSettingsService.PreferencesSettingsService.FoldersWidgetExpanded), 0);
 
-				folderWidget.LibraryCardInvoked -= FolderWidget_LibraryCardInvoked;
-				folderWidget.LibraryCardNewPaneInvoked -= FolderWidget_LibraryCardNewPaneInvoked;
-				folderWidget.LibraryCardPropertiesInvoked -= FolderWidget_LibraryCardPropertiesInvoked;
+				folderWidget.CardInvoked -= FolderWidget_CardInvoked;
+				folderWidget.CardNewPaneInvoked -= FolderWidget_CardNewPaneInvoked;
+				folderWidget.CardPropertiesInvoked -= FolderWidget_CardPropertiesInvoked;
 				folderWidget.FolderWidgethowMultiPaneControlsInvoked -= FolderWidget_FolderWidgethowMultiPaneControlsInvoked;
-				folderWidget.LibraryCardInvoked += FolderWidget_LibraryCardInvoked;
-				folderWidget.LibraryCardNewPaneInvoked += FolderWidget_LibraryCardNewPaneInvoked;
-				folderWidget.LibraryCardPropertiesInvoked += FolderWidget_LibraryCardPropertiesInvoked;
+				folderWidget.CardInvoked += FolderWidget_CardInvoked;
+				folderWidget.CardNewPaneInvoked += FolderWidget_CardNewPaneInvoked;
+				folderWidget.CardPropertiesInvoked += FolderWidget_CardPropertiesInvoked;
 				folderWidget.FolderWidgethowMultiPaneControlsInvoked += FolderWidget_FolderWidgethowMultiPaneControlsInvoked;
 			}
 			if (shouldReloadDrivesWidget && drivesWidget is not null)
@@ -175,7 +177,7 @@ private void RecentFilesWidget_RecentFilesOpenLocationInvoked(object sender, Use
 			});
 		}
 
-		private void FolderWidget_LibraryCardInvoked(object sender, LibraryCardInvokedEventArgs e)
+		private void FolderWidget_CardInvoked(object sender, QuickAccessCardInvokedEventArgs e)
 		{
 			AppInstance.NavigateWithArguments(FolderSettings.GetLayoutType(e.Path), new NavigationArguments()
 			{
@@ -184,14 +186,21 @@ private void FolderWidget_LibraryCardInvoked(object sender, LibraryCardInvokedEv
 			AppInstance.InstanceViewModel.IsPageTypeNotHome = true;     // show controls that were hidden on the home page
 		}
 
-		private void FolderWidget_LibraryCardNewPaneInvoked(object sender, LibraryCardInvokedEventArgs e)
+		private void FolderWidget_CardNewPaneInvoked(object sender, QuickAccessCardInvokedEventArgs e)
 		{
 			AppInstance.PaneHolder?.OpenPathInNewPane(e.Path);
 		}
 
-		private async void FolderWidget_LibraryCardPropertiesInvoked(object sender, LibraryCardEventArgs e)
+		private async void FolderWidget_CardPropertiesInvoked(object sender, QuickAccessCardEventArgs e)
 		{
-			await FilePropertiesHelpers.OpenPropertiesWindowAsync(new LibraryItem(e.Library), AppInstance);
+			ListedItem listedItem = new(null!)
+			{
+				ItemPath = e.Item.Path,
+				ItemNameRaw = e.Item.Text,
+				PrimaryItemAttribute = StorageItemTypes.Folder,
+				ItemType = "Folder".GetLocalizedResource(),
+			};
+			await FilePropertiesHelpers.OpenPropertiesWindowAsync(listedItem, AppInstance);
 		}
 
 		private void DrivesWidget_DrivesWidgetNewPaneInvoked(object sender, DrivesWidget.DrivesWidgetInvokedEventArgs e)
diff --git a/src/Files.Backend/Services/IQuickAccessService.cs b/src/Files.Backend/Services/IQuickAccessService.cs
index cf94e2d731d7..7ca080cbae22 100644
--- a/src/Files.Backend/Services/IQuickAccessService.cs
+++ b/src/Files.Backend/Services/IQuickAccessService.cs
@@ -9,7 +9,7 @@ public interface IQuickAccessService
 		/// Gets the list of quick access items
 		/// </summary>
 		/// <returns></returns>
-		Task<List<string>> GetPinnedFoldersAsync();
+		Task<List<string>> GetPinnedFoldersAsync(bool getRecentItems = false);
 
 		/// <summary>
 		/// Pins a folder to the quick access list

From e817f262b16bca1722d53ce4dddd01db5024c857 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sat, 4 Feb 2023 20:41:21 -0500
Subject: [PATCH 2/6] Cleanup

---
 src/Files.App/Helpers/WidgetsHelpers.cs       |   4 +-
 .../Settings/PreferencesSettingsService.cs    |   4 +-
 src/Files.App/Strings/en-US/Resources.resw    |   2 +-
 .../UserControls/Widgets/FolderWidget.xaml    | 145 -----------------
 .../Widgets/QuickAccessWidget.xaml            | 149 ++++++++++++++++++
 ...dget.xaml.cs => QuickAccessWidget.xaml.cs} |  12 +-
 .../PreferencesViewModel.cs                   |   8 +-
 src/Files.App/ViewModels/ToolbarViewModel.cs  |   2 +-
 .../Views/SettingsPages/Preferences.xaml      |   6 +-
 src/Files.App/Views/WidgetsPage.xaml.cs       |  32 ++--
 .../Settings/IPreferencesSettingsService.cs   |   4 +-
 11 files changed, 186 insertions(+), 182 deletions(-)
 delete mode 100644 src/Files.App/UserControls/Widgets/FolderWidget.xaml
 create mode 100644 src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
 rename src/Files.App/UserControls/Widgets/{FolderWidget.xaml.cs => QuickAccessWidget.xaml.cs} (96%)

diff --git a/src/Files.App/Helpers/WidgetsHelpers.cs b/src/Files.App/Helpers/WidgetsHelpers.cs
index 60a13691c0ef..6b2a40a75f29 100644
--- a/src/Files.App/Helpers/WidgetsHelpers.cs
+++ b/src/Files.App/Helpers/WidgetsHelpers.cs
@@ -37,9 +37,9 @@ public static class WidgetsHelpers
 
 		public static bool TryGetIsWidgetSettingEnabled<TWidget>(IPreferencesSettingsService preferencesSettingsService) where TWidget : IWidgetItemModel
 		{
-			if (typeof(TWidget) == typeof(FolderWidget))
+			if (typeof(TWidget) == typeof(QuickAccessWidget))
 			{
-				return preferencesSettingsService.ShowFoldersWidget;
+				return preferencesSettingsService.ShowQuickAccessWidget;
 			}
 			if (typeof(TWidget) == typeof(DrivesWidget))
 			{
diff --git a/src/Files.App/ServicesImplementation/Settings/PreferencesSettingsService.cs b/src/Files.App/ServicesImplementation/Settings/PreferencesSettingsService.cs
index 50b78ecfff26..54612ddd3a86 100644
--- a/src/Files.App/ServicesImplementation/Settings/PreferencesSettingsService.cs
+++ b/src/Files.App/ServicesImplementation/Settings/PreferencesSettingsService.cs
@@ -81,7 +81,7 @@ public bool AlwaysOpenDualPaneInNewTab
 			set => Set(value);
 		}
 
-		public bool ShowFoldersWidget
+		public bool ShowQuickAccessWidget
 		{
 			get => Get(true);
 			set => Set(value);
@@ -194,7 +194,7 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 				case nameof(AlwaysOpenNewInstance):
 				case nameof(IsDualPaneEnabled):
 				case nameof(AlwaysOpenDualPaneInNewTab):
-				case nameof(ShowFoldersWidget):
+				case nameof(ShowQuickAccessWidget):
 				case nameof(ShowRecentFilesWidget):
 				case nameof(ShowDrivesWidget):
 				case nameof(ShowBundlesWidget):
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 24d5fc1b75b0..883f74b66890 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -2902,6 +2902,6 @@
     <value>Display the edit tags flyout</value>
   </data>
   <data name="QuickAccess" xml:space="preserve">
-    <value>Quick Access</value>
+    <value>Quick access</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/Files.App/UserControls/Widgets/FolderWidget.xaml b/src/Files.App/UserControls/Widgets/FolderWidget.xaml
deleted file mode 100644
index f3f498776838..000000000000
--- a/src/Files.App/UserControls/Widgets/FolderWidget.xaml
+++ /dev/null
@@ -1,145 +0,0 @@
-<UserControl
-	x:Class="Files.App.UserControls.Widgets.FolderWidget"
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:helpers="using:Files.App.Helpers"
-	xmlns:local="using:Files.App.UserControls.Widgets"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
-	mc:Ignorable="d">
-	<Grid>
-		<ItemsRepeater
-			x:Name="CardsList"
-			Grid.Row="0"
-			HorizontalAlignment="Stretch"
-			ItemsSource="{x:Bind ItemsAdded, Mode=OneWay}">
-			<ItemsRepeater.Layout>
-				<UniformGridLayout
-					ItemsStretch="Fill"
-					MaximumRowsOrColumns="6"
-					MinColumnSpacing="8"
-					MinItemHeight="72"
-					MinItemWidth="100"
-					MinRowSpacing="8"
-					Orientation="Horizontal" />
-			</ItemsRepeater.Layout>
-			<ItemsRepeater.ItemTemplate>
-				<DataTemplate x:DataType="local:FolderCardItem">
-                    <Button
-						Padding="8"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch"
-						HorizontalContentAlignment="Stretch"
-						VerticalContentAlignment="Stretch"
-						AutomationProperties.Name="{x:Bind AutomationProperties}"
-						Command="{x:Bind SelectCommand}"
-						CommandParameter="{x:Bind}"
-						CornerRadius="{StaticResource ControlCornerRadius}"
-						PointerPressed="Button_PointerPressed"
-						Tag="{x:Bind Path}">
-                        <Button.ContextFlyout>
-                            <MenuFlyout Opening="MenuFlyout_Opening">
-                                <MenuFlyout.Items>
-                                    <MenuFlyoutItem
-										x:Name="OpenInNewPane"
-										x:Load="{x:Bind HasPath}"
-										Click="OpenInNewPane_Click"
-										DataContext="{x:Bind}"
-										Text="{helpers:ResourceString Name=SideBarOpenInNewPane/Text}"
-										Visibility="Collapsed">
-                                        <MenuFlyoutItem.Icon>
-                                            <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF117;" />
-                                        </MenuFlyoutItem.Icon>
-                                    </MenuFlyoutItem>
-                                    <MenuFlyoutItem
-										x:Name="OpenInNewTab"
-										x:Load="{x:Bind HasPath}"
-										Click="OpenInNewTab_Click"
-										DataContext="{x:Bind}"
-										Text="{helpers:ResourceString Name=SideBarOpenInNewTab/Text}">
-                                        <MenuFlyoutItem.Icon>
-                                            <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF113;" />
-                                        </MenuFlyoutItem.Icon>
-                                    </MenuFlyoutItem>
-                                    <MenuFlyoutItem
-										x:Name="OpenInNewWindow"
-										x:Load="{x:Bind HasPath}"
-										Click="OpenInNewWindow_Click"
-										DataContext="{x:Bind}"
-										Text="{helpers:ResourceString Name=SideBarOpenInNewWindow/Text}">
-                                        <MenuFlyoutItem.Icon>
-                                            <FontIcon Glyph="&#xE737;" />
-                                        </MenuFlyoutItem.Icon>
-                                    </MenuFlyoutItem>
-	                                <MenuFlyoutItem
-		                                x:Name="PinToFavorites"
-		                                Click="PinToFavorites_Click"
-		                                DataContext="{x:Bind}"
-		                                Text="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutPinToFavorites/Text}"
-		                                Visibility="Collapsed">
-		                                <MenuFlyoutItem.Icon>
-			                                <FontIcon Glyph="&#xE840;" />
-		                                </MenuFlyoutItem.Icon>
-	                                </MenuFlyoutItem>
-	                                <MenuFlyoutItem
-		                                x:Name="UnpinFromFavorites"
-		                                Click="UnpinFromFavorites_Click"
-		                                DataContext="{x:Bind}"
-		                                Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutUnpinFromFavorites/Text}"
-		                                Visibility="Collapsed">
-		                                <MenuFlyoutItem.Icon>
-			                                <FontIcon Glyph="&#xE77A;" />
-		                                </MenuFlyoutItem.Icon>
-	                                </MenuFlyoutItem>
-                                    <MenuFlyoutItem
-										x:Name="Properties"
-										Click="OpenProperties_Click"
-										DataContext="{x:Bind}"
-										Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutPropertiesFolder/Text}">
-                                        <MenuFlyoutItem.Icon>
-                                            <FontIcon Glyph="&#xE946;" />
-                                        </MenuFlyoutItem.Icon>
-                                    </MenuFlyoutItem>
-                                </MenuFlyout.Items>
-                            </MenuFlyout>
-                        </Button.ContextFlyout>
-                        <Grid
-							HorizontalAlignment="Stretch"
-							VerticalAlignment="Stretch"
-							RowSpacing="0">
-                            <Grid.RowDefinitions>
-								<RowDefinition Height="*" />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-	                        <StackPanel Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right">
-		                        <FontIcon x:Name="PinIcon" 
-		                                  Glyph="&#xE840;"
-										  FontSize="14"
-		                                  Visibility="{x:Bind IsPinned}" />
-	                        </StackPanel>
-                            <Image
-								Grid.Row="0"
-								Width="32"
-								Height="32"
-								HorizontalAlignment="Center"
-								VerticalAlignment="Center"
-								Source="{x:Bind Thumbnail, Mode=OneWay}"
-								Stretch="Uniform" />
-							<TextBlock
-								x:Name="ItemLocationName"
-								Grid.Row="1"
-								HorizontalAlignment="Center"
-								VerticalAlignment="Center"
-								FontSize="14"
-								HorizontalTextAlignment="Center"
-								Text="{x:Bind Text}"
-								TextTrimming="WordEllipsis"
-								TextWrapping="NoWrap" />
-						</Grid>
-					</Button>
-				</DataTemplate>
-			</ItemsRepeater.ItemTemplate>
-		</ItemsRepeater>
-	</Grid>
-</UserControl>
\ No newline at end of file
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
new file mode 100644
index 000000000000..427e84dbed44
--- /dev/null
+++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
@@ -0,0 +1,149 @@
+<UserControl
+	x:Class="Files.App.UserControls.Widgets.QuickAccessWidget"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:helpers="using:Files.App.Helpers"
+	xmlns:local="using:Files.App.UserControls.Widgets"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
+	mc:Ignorable="d">
+	<Grid>
+		<ItemsRepeater
+			x:Name="CardsList"
+			Grid.Row="0"
+			HorizontalAlignment="Stretch"
+			ItemsSource="{x:Bind ItemsAdded, Mode=OneWay}">
+			<ItemsRepeater.Layout>
+				<UniformGridLayout
+					ItemsStretch="Fill"
+					MaximumRowsOrColumns="6"
+					MinColumnSpacing="8"
+					MinItemHeight="72"
+					MinItemWidth="100"
+					MinRowSpacing="8"
+					Orientation="Horizontal" />
+			</ItemsRepeater.Layout>
+			<ItemsRepeater.ItemTemplate>
+				<DataTemplate x:DataType="local:FolderCardItem">
+					<Button
+						Padding="8"
+						HorizontalAlignment="Stretch"
+						VerticalAlignment="Stretch"
+						HorizontalContentAlignment="Stretch"
+						VerticalContentAlignment="Stretch"
+						AutomationProperties.Name="{x:Bind AutomationProperties}"
+						Command="{x:Bind SelectCommand}"
+						CommandParameter="{x:Bind}"
+						CornerRadius="{StaticResource ControlCornerRadius}"
+						PointerPressed="Button_PointerPressed"
+						Tag="{x:Bind Path}">
+						<Button.ContextFlyout>
+							<MenuFlyout Opening="MenuFlyout_Opening">
+								<MenuFlyout.Items>
+									<MenuFlyoutItem
+										x:Name="OpenInNewPane"
+										x:Load="{x:Bind HasPath}"
+										Click="OpenInNewPane_Click"
+										DataContext="{x:Bind}"
+										Text="{helpers:ResourceString Name=SideBarOpenInNewPane/Text}"
+										Visibility="Collapsed">
+										<MenuFlyoutItem.Icon>
+											<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF117;" />
+										</MenuFlyoutItem.Icon>
+									</MenuFlyoutItem>
+									<MenuFlyoutItem
+										x:Name="OpenInNewTab"
+										x:Load="{x:Bind HasPath}"
+										Click="OpenInNewTab_Click"
+										DataContext="{x:Bind}"
+										Text="{helpers:ResourceString Name=SideBarOpenInNewTab/Text}">
+										<MenuFlyoutItem.Icon>
+											<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF113;" />
+										</MenuFlyoutItem.Icon>
+									</MenuFlyoutItem>
+									<MenuFlyoutItem
+										x:Name="OpenInNewWindow"
+										x:Load="{x:Bind HasPath}"
+										Click="OpenInNewWindow_Click"
+										DataContext="{x:Bind}"
+										Text="{helpers:ResourceString Name=SideBarOpenInNewWindow/Text}">
+										<MenuFlyoutItem.Icon>
+											<FontIcon Glyph="&#xE737;" />
+										</MenuFlyoutItem.Icon>
+									</MenuFlyoutItem>
+									<MenuFlyoutItem
+										x:Name="PinToFavorites"
+										Click="PinToFavorites_Click"
+										DataContext="{x:Bind}"
+										Text="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutPinToFavorites/Text}"
+										Visibility="Collapsed">
+										<MenuFlyoutItem.Icon>
+											<FontIcon Glyph="&#xE840;" />
+										</MenuFlyoutItem.Icon>
+									</MenuFlyoutItem>
+									<MenuFlyoutItem
+										x:Name="UnpinFromFavorites"
+										Click="UnpinFromFavorites_Click"
+										DataContext="{x:Bind}"
+										Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutUnpinFromFavorites/Text}"
+										Visibility="Collapsed">
+										<MenuFlyoutItem.Icon>
+											<FontIcon Glyph="&#xE77A;" />
+										</MenuFlyoutItem.Icon>
+									</MenuFlyoutItem>
+									<MenuFlyoutItem
+										x:Name="Properties"
+										Click="OpenProperties_Click"
+										DataContext="{x:Bind}"
+										Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutPropertiesFolder/Text}">
+										<MenuFlyoutItem.Icon>
+											<FontIcon Glyph="&#xE946;" />
+										</MenuFlyoutItem.Icon>
+									</MenuFlyoutItem>
+								</MenuFlyout.Items>
+							</MenuFlyout>
+						</Button.ContextFlyout>
+						<Grid
+							HorizontalAlignment="Stretch"
+							VerticalAlignment="Stretch"
+							RowSpacing="0">
+							<Grid.RowDefinitions>
+								<RowDefinition Height="*" />
+								<RowDefinition Height="Auto" />
+							</Grid.RowDefinitions>
+							<StackPanel
+								HorizontalAlignment="Right"
+								VerticalAlignment="Top"
+								Orientation="Horizontal">
+								<FontIcon
+									x:Name="PinIcon"
+									FontSize="14"
+									Glyph="&#xE840;"
+									Visibility="{x:Bind IsPinned}" />
+							</StackPanel>
+							<Image
+								Grid.Row="0"
+								Width="32"
+								Height="32"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								Source="{x:Bind Thumbnail, Mode=OneWay}"
+								Stretch="Uniform" />
+							<TextBlock
+								x:Name="ItemLocationName"
+								Grid.Row="1"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								FontSize="14"
+								HorizontalTextAlignment="Center"
+								Text="{x:Bind Text}"
+								TextTrimming="WordEllipsis"
+								TextWrapping="NoWrap" />
+						</Grid>
+					</Button>
+				</DataTemplate>
+			</ItemsRepeater.ItemTemplate>
+		</ItemsRepeater>
+	</Grid>
+</UserControl>
\ No newline at end of file
diff --git a/src/Files.App/UserControls/Widgets/FolderWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
similarity index 96%
rename from src/Files.App/UserControls/Widgets/FolderWidget.xaml.cs
rename to src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
index 5fde6212d1cc..a0666a1f510d 100644
--- a/src/Files.App/UserControls/Widgets/FolderWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -104,7 +104,7 @@ public async Task LoadCardThumbnailAsync()
 		}
 	}
 
-	public sealed partial class FolderWidget : UserControl, IWidgetItemModel, INotifyPropertyChanged
+	public sealed partial class QuickAccessWidget : UserControl, IWidgetItemModel, INotifyPropertyChanged
 	{
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
@@ -114,7 +114,7 @@ public sealed partial class FolderWidget : UserControl, IWidgetItemModel, INotif
 
 		private bool showMultiPaneControls;
 
-		public FolderWidget()
+		public QuickAccessWidget()
 		{
 			InitializeComponent();
 
@@ -136,11 +136,11 @@ public FolderWidget()
 
 		public event LibraryCardPropertiesInvokedEventHandler CardPropertiesInvoked;
 
-		public event EventHandler FolderWidgethowMultiPaneControlsInvoked;
+		public event EventHandler QuickAccessWidgetShowMultiPaneControlsInvoked;
 
 		public event PropertyChangedEventHandler PropertyChanged;
 
-		public bool IsWidgetSettingEnabled => UserSettingsService.PreferencesSettingsService.ShowFoldersWidget;
+		public bool IsWidgetSettingEnabled => UserSettingsService.PreferencesSettingsService.ShowQuickAccessWidget;
 
 		public ICommand QuickAccessCardCommand { get; }
 
@@ -152,7 +152,7 @@ public bool ShowMultiPaneControls
 		{
 			get
 			{
-				FolderWidgethowMultiPaneControlsInvoked?.Invoke(this, EventArgs.Empty);
+				QuickAccessWidgetShowMultiPaneControlsInvoked?.Invoke(this, EventArgs.Empty);
 
 				return showMultiPaneControls;
 			}
@@ -166,7 +166,7 @@ public bool ShowMultiPaneControls
 			}
 		}
 
-		public string WidgetName => nameof(FolderWidget);
+		public string WidgetName => nameof(QuickAccessWidget);
 
 		public string AutomationProperties => "FolderWidgetAutomationProperties/Name".GetLocalizedResource();
 
diff --git a/src/Files.App/ViewModels/SettingsViewModels/PreferencesViewModel.cs b/src/Files.App/ViewModels/SettingsViewModels/PreferencesViewModel.cs
index d1876846a6bf..964384825e53 100644
--- a/src/Files.App/ViewModels/SettingsViewModels/PreferencesViewModel.cs
+++ b/src/Files.App/ViewModels/SettingsViewModels/PreferencesViewModel.cs
@@ -460,13 +460,13 @@ public bool SearchUnindexedItems
 			}
 		}
 
-		public bool ShowFoldersWidget
+		public bool ShowQuickAccessWidget
 		{
-			get => UserSettingsService.PreferencesSettingsService.ShowFoldersWidget;
+			get => UserSettingsService.PreferencesSettingsService.ShowQuickAccessWidget;
 			set
 			{
-				if (value != UserSettingsService.PreferencesSettingsService.ShowFoldersWidget)
-					UserSettingsService.PreferencesSettingsService.ShowFoldersWidget = value;
+				if (value != UserSettingsService.PreferencesSettingsService.ShowQuickAccessWidget)
+					UserSettingsService.PreferencesSettingsService.ShowQuickAccessWidget = value;
 			}
 		}
 
diff --git a/src/Files.App/ViewModels/ToolbarViewModel.cs b/src/Files.App/ViewModels/ToolbarViewModel.cs
index 7047e2e12aee..edc6c74e7aab 100644
--- a/src/Files.App/ViewModels/ToolbarViewModel.cs
+++ b/src/Files.App/ViewModels/ToolbarViewModel.cs
@@ -445,7 +445,7 @@ private void UserSettingsService_OnSettingChangedEvent(object? sender, SettingCh
 		{
 			switch (e.SettingName)
 			{
-				case nameof(UserSettingsService.PreferencesSettingsService.ShowFoldersWidget): // ToDo: Move this to the widget page, it doesn't belong here.
+				case nameof(UserSettingsService.PreferencesSettingsService.ShowQuickAccessWidget): // ToDo: Move this to the widget page, it doesn't belong here.
 				case nameof(UserSettingsService.PreferencesSettingsService.ShowDrivesWidget):
 				case nameof(UserSettingsService.PreferencesSettingsService.ShowBundlesWidget):
 				case nameof(UserSettingsService.PreferencesSettingsService.ShowFileTagsWidget):
diff --git a/src/Files.App/Views/SettingsPages/Preferences.xaml b/src/Files.App/Views/SettingsPages/Preferences.xaml
index 1d9baf4c5d9f..d0c9c1b7d9ef 100644
--- a/src/Files.App/Views/SettingsPages/Preferences.xaml
+++ b/src/Files.App/Views/SettingsPages/Preferences.xaml
@@ -225,10 +225,10 @@
 				</local:SettingsBlockControl.Icon>
 				<local:SettingsBlockControl.ExpandableContent>
 					<StackPanel>
-						<local:SettingsBlockControl Title="{helpers:ResourceString Name=Folders}" HorizontalAlignment="Stretch">
+						<local:SettingsBlockControl Title="{helpers:ResourceString Name=QuickAccess}" HorizontalAlignment="Stretch">
 							<ToggleSwitch
-								AutomationProperties.Name="{helpers:ResourceString Name=Folders}"
-								IsOn="{x:Bind ViewModel.ShowFoldersWidget, Mode=TwoWay}"
+								AutomationProperties.Name="{helpers:ResourceString Name=QuickAccess}"
+								IsOn="{x:Bind ViewModel.ShowQuickAccessWidget, Mode=TwoWay}"
 								Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 						</local:SettingsBlockControl>
 
diff --git a/src/Files.App/Views/WidgetsPage.xaml.cs b/src/Files.App/Views/WidgetsPage.xaml.cs
index 72a4c161063a..11100b70ead7 100644
--- a/src/Files.App/Views/WidgetsPage.xaml.cs
+++ b/src/Files.App/Views/WidgetsPage.xaml.cs
@@ -26,7 +26,7 @@ public sealed partial class WidgetsPage : Page, IDisposable
 		private IShellPage AppInstance = null;
 		public FolderSettingsViewModel FolderSettings => AppInstance?.InstanceViewModel.FolderSettings;
 
-		private FolderWidget folderWidget;
+		private QuickAccessWidget quickAccessWidget;
 		private DrivesWidget drivesWidget;
 		private BundlesWidget bundlesWidget;
 		private FileTagsWidget fileTagsWidget;
@@ -62,24 +62,24 @@ private void ViewModel_WidgetListRefreshRequestedInvoked(object? sender, EventAr
 
 		public void ReloadWidgets()
 		{
-			folderWidget = WidgetsHelpers.TryGetWidget<FolderWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadFolderWidget, folderWidget);
+			quickAccessWidget = WidgetsHelpers.TryGetWidget<QuickAccessWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadFolderWidget, quickAccessWidget);
 			drivesWidget = WidgetsHelpers.TryGetWidget<DrivesWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadDrivesWidget, drivesWidget);
 			bundlesWidget = WidgetsHelpers.TryGetWidget<BundlesWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadBundles, bundlesWidget);
 			fileTagsWidget = WidgetsHelpers.TryGetWidget<FileTagsWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadFileTags, fileTagsWidget);
 			recentFilesWidget = WidgetsHelpers.TryGetWidget<RecentFilesWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadRecentFiles, recentFilesWidget);
 
-			if (shouldReloadFolderWidget && folderWidget is not null)
+			if (shouldReloadFolderWidget && quickAccessWidget is not null)
 			{
-				Widgets.ViewModel.InsertWidget(new(folderWidget, (value) => UserSettingsService.PreferencesSettingsService.FoldersWidgetExpanded = value, () => UserSettingsService.PreferencesSettingsService.FoldersWidgetExpanded), 0);
-
-				folderWidget.CardInvoked -= FolderWidget_CardInvoked;
-				folderWidget.CardNewPaneInvoked -= FolderWidget_CardNewPaneInvoked;
-				folderWidget.CardPropertiesInvoked -= FolderWidget_CardPropertiesInvoked;
-				folderWidget.FolderWidgethowMultiPaneControlsInvoked -= FolderWidget_FolderWidgethowMultiPaneControlsInvoked;
-				folderWidget.CardInvoked += FolderWidget_CardInvoked;
-				folderWidget.CardNewPaneInvoked += FolderWidget_CardNewPaneInvoked;
-				folderWidget.CardPropertiesInvoked += FolderWidget_CardPropertiesInvoked;
-				folderWidget.FolderWidgethowMultiPaneControlsInvoked += FolderWidget_FolderWidgethowMultiPaneControlsInvoked;
+				Widgets.ViewModel.InsertWidget(new(quickAccessWidget, (value) => UserSettingsService.PreferencesSettingsService.FoldersWidgetExpanded = value, () => UserSettingsService.PreferencesSettingsService.FoldersWidgetExpanded), 0);
+
+				quickAccessWidget.CardInvoked -= FolderWidget_CardInvoked;
+				quickAccessWidget.CardNewPaneInvoked -= FolderWidget_CardNewPaneInvoked;
+				quickAccessWidget.CardPropertiesInvoked -= FolderWidget_CardPropertiesInvoked;
+				quickAccessWidget.QuickAccessWidgetShowMultiPaneControlsInvoked -= QuickAccessWidget_QuickAccessWidgetShowMultiPaneControlsInvoked;
+				quickAccessWidget.CardInvoked += FolderWidget_CardInvoked;
+				quickAccessWidget.CardNewPaneInvoked += FolderWidget_CardNewPaneInvoked;
+				quickAccessWidget.CardPropertiesInvoked += FolderWidget_CardPropertiesInvoked;
+				quickAccessWidget.QuickAccessWidgetShowMultiPaneControlsInvoked += QuickAccessWidget_QuickAccessWidgetShowMultiPaneControlsInvoked;
 			}
 			if (shouldReloadDrivesWidget && drivesWidget is not null)
 			{
@@ -120,11 +120,11 @@ private void ViewModel_YourHomeLoadedInvoked(object? sender, Microsoft.UI.Xaml.R
 			ReloadWidgets();
 		}
 
-		private void FolderWidget_FolderWidgethowMultiPaneControlsInvoked(object sender, EventArgs e)
+		private void QuickAccessWidget_QuickAccessWidgetShowMultiPaneControlsInvoked(object sender, EventArgs e)
 		{
-			FolderWidget FolderWidget = (FolderWidget)sender;
+			QuickAccessWidget QuickAccessWidget = (QuickAccessWidget)sender;
 
-			FolderWidget.ShowMultiPaneControls = AppInstance.PaneHolder?.IsMultiPaneEnabled ?? false;
+			QuickAccessWidget.ShowMultiPaneControls = AppInstance.PaneHolder?.IsMultiPaneEnabled ?? false;
 		}
 
 		// WINUI3
diff --git a/src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs b/src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs
index a48cec4636dd..33db2d9015a6 100644
--- a/src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs
+++ b/src/Files.Backend/Services/Settings/IPreferencesSettingsService.cs
@@ -62,9 +62,9 @@ public interface IPreferencesSettingsService : IBaseSettingsService, INotifyProp
 		bool AlwaysOpenDualPaneInNewTab { get; set; }
 
 		/// <summary>
-		/// Gets or sets a value indicating whether or not to display the folders widget.
+		/// Gets or sets a value indicating whether or not to display the quick access widget.
 		/// </summary>
-		bool ShowFoldersWidget { get; set; }
+		bool ShowQuickAccessWidget { get; set; }
 
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to display the recent files widget.

From 4421de89b2b22e436f66d88d7acd62af714d40e3 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sat, 4 Feb 2023 20:43:47 -0500
Subject: [PATCH 3/6] Update QuickAccessWidget.xaml

---
 .../UserControls/Widgets/QuickAccessWidget.xaml     | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
index 427e84dbed44..0be8ee509e08 100644
--- a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
+++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
@@ -112,16 +112,13 @@
 								<RowDefinition Height="*" />
 								<RowDefinition Height="Auto" />
 							</Grid.RowDefinitions>
-							<StackPanel
+							<FontIcon
+								x:Name="PinIcon"
 								HorizontalAlignment="Right"
 								VerticalAlignment="Top"
-								Orientation="Horizontal">
-								<FontIcon
-									x:Name="PinIcon"
-									FontSize="14"
-									Glyph="&#xE840;"
-									Visibility="{x:Bind IsPinned}" />
-							</StackPanel>
+								FontSize="14"
+								Glyph="&#xE840;"
+								x:Load="{x:Bind IsPinned, Mode=OneWay}" />
 							<Image
 								Grid.Row="0"
 								Width="32"

From 583b9a20d954639b25496881a6a21d58bd8053db Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sat, 4 Feb 2023 20:45:09 -0500
Subject: [PATCH 4/6] Update QuickAccessWidget.xaml

---
 src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
index 0be8ee509e08..7faeb5718242 100644
--- a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
+++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
@@ -116,7 +116,7 @@
 								x:Name="PinIcon"
 								HorizontalAlignment="Right"
 								VerticalAlignment="Top"
-								FontSize="14"
+								FontSize="12"
 								Glyph="&#xE840;"
 								x:Load="{x:Bind IsPinned, Mode=OneWay}" />
 							<Image

From d196303678bb8c013e5b9f7595d4145d513e40de Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sat, 4 Feb 2023 20:48:40 -0500
Subject: [PATCH 5/6] CU

---
 .../DataModels/NavigationControlItems/LocationItem.cs          | 1 +
 src/Files.App/Filesystem/QuickAccessManager.cs                 | 3 +++
 src/Files.App/ServicesImplementation/QuickAccessService.cs     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/Files.App/DataModels/NavigationControlItems/LocationItem.cs b/src/Files.App/DataModels/NavigationControlItems/LocationItem.cs
index c55ba6506064..d08d0849b50a 100644
--- a/src/Files.App/DataModels/NavigationControlItems/LocationItem.cs
+++ b/src/Files.App/DataModels/NavigationControlItems/LocationItem.cs
@@ -57,6 +57,7 @@ public bool IsExpanded
 		public bool IsInvalid { get; set; } = false;
 
 		public bool IsPinned => App.QuickAccessManager.Model.FavoriteItems.Contains(path);
+
 		public SectionType Section { get; set; }
 
 		public ContextMenuOptions MenuOptions { get; set; }
diff --git a/src/Files.App/Filesystem/QuickAccessManager.cs b/src/Files.App/Filesystem/QuickAccessManager.cs
index dff0e36139fb..6daea5445691 100644
--- a/src/Files.App/Filesystem/QuickAccessManager.cs
+++ b/src/Files.App/Filesystem/QuickAccessManager.cs
@@ -17,8 +17,11 @@ namespace Files.App.Filesystem
 	public sealed class QuickAccessManager
 	{
 		public FileSystemWatcher? PinnedItemsWatcher;
+
 		public event FileSystemEventHandler? PinnedItemsModified;
+		
 		public EventHandler<ModifyQuickAccessEventArgs>? UpdateFolderWidget;
+
 		public IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService<IQuickAccessService>();
 
 		public SidebarPinnedModel Model;
diff --git a/src/Files.App/ServicesImplementation/QuickAccessService.cs b/src/Files.App/ServicesImplementation/QuickAccessService.cs
index 554114c719c9..dffa6fbfd20e 100644
--- a/src/Files.App/ServicesImplementation/QuickAccessService.cs
+++ b/src/Files.App/ServicesImplementation/QuickAccessService.cs
@@ -35,6 +35,7 @@ public async Task PinToSidebar(string[] folderPaths)
 		{
 			await ContextMenu.InvokeVerb("pintohome", folderPaths);
 			await App.QuickAccessManager.Model.LoadAsync();
+			
 			App.QuickAccessManager.UpdateFolderWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, true));
 		}
 		
@@ -54,6 +55,7 @@ await SafetyExtensions.IgnoreExceptions(async () => {
 					});
 
 			await App.QuickAccessManager.Model.LoadAsync();
+			
 			App.QuickAccessManager.UpdateFolderWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, false));
 		}
 	}

From 5aefc470ded5c41113e22a7f62824d051825b386 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sat, 4 Feb 2023 20:56:33 -0500
Subject: [PATCH 6/6] Cleanup

---
 .../Filesystem/QuickAccessManager.cs          |  2 +-
 .../QuickAccessService.cs                     |  4 ++--
 src/Files.App/Strings/en-US/Resources.resw    |  3 ---
 .../Widgets/QuickAccessWidget.xaml.cs         | 18 +++++++--------
 src/Files.App/Views/WidgetsPage.xaml.cs       | 22 +++++++++----------
 5 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/Files.App/Filesystem/QuickAccessManager.cs b/src/Files.App/Filesystem/QuickAccessManager.cs
index 6daea5445691..d1a54d00bcb7 100644
--- a/src/Files.App/Filesystem/QuickAccessManager.cs
+++ b/src/Files.App/Filesystem/QuickAccessManager.cs
@@ -20,7 +20,7 @@ public sealed class QuickAccessManager
 
 		public event FileSystemEventHandler? PinnedItemsModified;
 		
-		public EventHandler<ModifyQuickAccessEventArgs>? UpdateFolderWidget;
+		public EventHandler<ModifyQuickAccessEventArgs>? UpdateQuickAccessWidget;
 
 		public IQuickAccessService QuickAccessService { get; } = Ioc.Default.GetRequiredService<IQuickAccessService>();
 
diff --git a/src/Files.App/ServicesImplementation/QuickAccessService.cs b/src/Files.App/ServicesImplementation/QuickAccessService.cs
index dffa6fbfd20e..9b9b42e11d3a 100644
--- a/src/Files.App/ServicesImplementation/QuickAccessService.cs
+++ b/src/Files.App/ServicesImplementation/QuickAccessService.cs
@@ -36,7 +36,7 @@ public async Task PinToSidebar(string[] folderPaths)
 			await ContextMenu.InvokeVerb("pintohome", folderPaths);
 			await App.QuickAccessManager.Model.LoadAsync();
 			
-			App.QuickAccessManager.UpdateFolderWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, true));
+			App.QuickAccessManager.UpdateQuickAccessWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, true));
 		}
 		
 		public async Task UnpinFromSidebar(string folderPath)
@@ -56,7 +56,7 @@ await SafetyExtensions.IgnoreExceptions(async () => {
 
 			await App.QuickAccessManager.Model.LoadAsync();
 			
-			App.QuickAccessManager.UpdateFolderWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, false));
+			App.QuickAccessManager.UpdateQuickAccessWidget?.Invoke(this, new ModifyQuickAccessEventArgs(folderPaths, false));
 		}
 	}
 }
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index 883f74b66890..c15ee377b681 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -2289,9 +2289,6 @@
   <data name="DrivesWidgetAutomationProperties.Name" xml:space="preserve">
     <value>Drives Widget</value>
   </data>
-  <data name="FolderWidgetAutomationProperties.Name" xml:space="preserve">
-    <value>Folders Widget</value>
-  </data>
   <data name="RecentFilesWidgetAutomationProperties.Name" xml:space="preserve">
     <value>Recent Files Widget</value>
   </data>
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
index a0666a1f510d..aa1e5cb0ac12 100644
--- a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -120,8 +120,8 @@ public QuickAccessWidget()
 
 			QuickAccessCardCommand = new AsyncRelayCommand<FolderCardItem>(OpenCard);
 
-			Loaded += FolderWidget_Loaded;
-			Unloaded += FolderWidget_Unloaded;
+			Loaded += QuickAccessWidget_Loaded;
+			Unloaded += QuickAccessWidget_Unloaded;
 		}
 
 		public delegate void LibraryCardInvokedEventHandler(object sender, QuickAccessCardInvokedEventArgs e);
@@ -168,7 +168,7 @@ public bool ShowMultiPaneControls
 
 		public string WidgetName => nameof(QuickAccessWidget);
 
-		public string AutomationProperties => "FolderWidgetAutomationProperties/Name".GetLocalizedResource();
+		public string AutomationProperties => "QuickAccess".GetLocalizedResource();
 
 		public string WidgetHeader => "QuickAccess".GetLocalizedResource();
 
@@ -198,9 +198,9 @@ private async void ModifyItem(object? sender, ModifyQuickAccessEventArgs? e)
 					ItemsAdded.Remove(itemToRemove);
 		}
 
-		private async void FolderWidget_Loaded(object sender, RoutedEventArgs e)
+		private async void QuickAccessWidget_Loaded(object sender, RoutedEventArgs e)
 		{
-			Loaded -= FolderWidget_Loaded;
+			Loaded -= QuickAccessWidget_Loaded;
 
 			var itemsToAdd = await QuickAccessService.GetPinnedFoldersAsync(true);
 
@@ -219,16 +219,16 @@ private async void FolderWidget_Loaded(object sender, RoutedEventArgs e)
 				idx++;
 			}
 
-			App.QuickAccessManager.UpdateFolderWidget += ModifyItem;
+			App.QuickAccessManager.UpdateQuickAccessWidget += ModifyItem;
 
 			var cardLoadTasks = ItemsAdded.Select(cardItem => cardItem.LoadCardThumbnailAsync());
 			await Task.WhenAll(cardLoadTasks);
 		}
 
-		private void FolderWidget_Unloaded(object sender, RoutedEventArgs e)
+		private void QuickAccessWidget_Unloaded(object sender, RoutedEventArgs e)
 		{
-			Unloaded -= FolderWidget_Unloaded;
-			App.QuickAccessManager.UpdateFolderWidget += ModifyItem;
+			Unloaded -= QuickAccessWidget_Unloaded;
+			App.QuickAccessManager.UpdateQuickAccessWidget += ModifyItem;
 		}
 
 		private void MenuFlyout_Opening(object sender, object e)
diff --git a/src/Files.App/Views/WidgetsPage.xaml.cs b/src/Files.App/Views/WidgetsPage.xaml.cs
index 11100b70ead7..d32c43006014 100644
--- a/src/Files.App/Views/WidgetsPage.xaml.cs
+++ b/src/Files.App/Views/WidgetsPage.xaml.cs
@@ -62,23 +62,23 @@ private void ViewModel_WidgetListRefreshRequestedInvoked(object? sender, EventAr
 
 		public void ReloadWidgets()
 		{
-			quickAccessWidget = WidgetsHelpers.TryGetWidget<QuickAccessWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadFolderWidget, quickAccessWidget);
+			quickAccessWidget = WidgetsHelpers.TryGetWidget<QuickAccessWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadQuickAccessWidget, quickAccessWidget);
 			drivesWidget = WidgetsHelpers.TryGetWidget<DrivesWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadDrivesWidget, drivesWidget);
 			bundlesWidget = WidgetsHelpers.TryGetWidget<BundlesWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadBundles, bundlesWidget);
 			fileTagsWidget = WidgetsHelpers.TryGetWidget<FileTagsWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadFileTags, fileTagsWidget);
 			recentFilesWidget = WidgetsHelpers.TryGetWidget<RecentFilesWidget>(UserSettingsService.PreferencesSettingsService, Widgets.ViewModel, out bool shouldReloadRecentFiles, recentFilesWidget);
 
-			if (shouldReloadFolderWidget && quickAccessWidget is not null)
+			if (shouldReloadQuickAccessWidget && quickAccessWidget is not null)
 			{
 				Widgets.ViewModel.InsertWidget(new(quickAccessWidget, (value) => UserSettingsService.PreferencesSettingsService.FoldersWidgetExpanded = value, () => UserSettingsService.PreferencesSettingsService.FoldersWidgetExpanded), 0);
 
-				quickAccessWidget.CardInvoked -= FolderWidget_CardInvoked;
-				quickAccessWidget.CardNewPaneInvoked -= FolderWidget_CardNewPaneInvoked;
-				quickAccessWidget.CardPropertiesInvoked -= FolderWidget_CardPropertiesInvoked;
+				quickAccessWidget.CardInvoked -= QuickAccessWidget_CardInvoked;
+				quickAccessWidget.CardNewPaneInvoked -= QuickAccessWidget_CardNewPaneInvoked;
+				quickAccessWidget.CardPropertiesInvoked -= QuickAccessWidget_CardPropertiesInvoked;
 				quickAccessWidget.QuickAccessWidgetShowMultiPaneControlsInvoked -= QuickAccessWidget_QuickAccessWidgetShowMultiPaneControlsInvoked;
-				quickAccessWidget.CardInvoked += FolderWidget_CardInvoked;
-				quickAccessWidget.CardNewPaneInvoked += FolderWidget_CardNewPaneInvoked;
-				quickAccessWidget.CardPropertiesInvoked += FolderWidget_CardPropertiesInvoked;
+				quickAccessWidget.CardInvoked += QuickAccessWidget_CardInvoked;
+				quickAccessWidget.CardNewPaneInvoked += QuickAccessWidget_CardNewPaneInvoked;
+				quickAccessWidget.CardPropertiesInvoked += QuickAccessWidget_CardPropertiesInvoked;
 				quickAccessWidget.QuickAccessWidgetShowMultiPaneControlsInvoked += QuickAccessWidget_QuickAccessWidgetShowMultiPaneControlsInvoked;
 			}
 			if (shouldReloadDrivesWidget && drivesWidget is not null)
@@ -177,7 +177,7 @@ private void RecentFilesWidget_RecentFilesOpenLocationInvoked(object sender, Use
 			});
 		}
 
-		private void FolderWidget_CardInvoked(object sender, QuickAccessCardInvokedEventArgs e)
+		private void QuickAccessWidget_CardInvoked(object sender, QuickAccessCardInvokedEventArgs e)
 		{
 			AppInstance.NavigateWithArguments(FolderSettings.GetLayoutType(e.Path), new NavigationArguments()
 			{
@@ -186,12 +186,12 @@ private void FolderWidget_CardInvoked(object sender, QuickAccessCardInvokedEvent
 			AppInstance.InstanceViewModel.IsPageTypeNotHome = true;     // show controls that were hidden on the home page
 		}
 
-		private void FolderWidget_CardNewPaneInvoked(object sender, QuickAccessCardInvokedEventArgs e)
+		private void QuickAccessWidget_CardNewPaneInvoked(object sender, QuickAccessCardInvokedEventArgs e)
 		{
 			AppInstance.PaneHolder?.OpenPathInNewPane(e.Path);
 		}
 
-		private async void FolderWidget_CardPropertiesInvoked(object sender, QuickAccessCardEventArgs e)
+		private async void QuickAccessWidget_CardPropertiesInvoked(object sender, QuickAccessCardEventArgs e)
 		{
 			ListedItem listedItem = new(null!)
 			{