From c42b2d7fe3dceb67a271f6fdce685323e2167269 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Wed, 8 Nov 2023 18:24:40 -0500
Subject: [PATCH 1/2] Fix: Fixed issue with viewing folder details

---
 src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs b/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs
index 8e06f242c1ed..778553fc795b 100644
--- a/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs
@@ -296,7 +296,10 @@ public async Task UpdateSelectedItemPreviewAsync(bool downloadItem = false)
 						await LoadPreviewControlAsync(loadCancellationTokenSource.Token, downloadItem);
 					}
 					else
+					{
 						await LoadBasicPreviewAsync();
+						return;
+					}
 				}
 				catch (Exception e)
 				{

From 68cccf089f2357250896a2ffb083fce770344c33 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Wed, 8 Nov 2023 18:34:53 -0500
Subject: [PATCH 2/2] Update PreviewPaneViewModel.cs

---
 src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs b/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs
index 778553fc795b..6d86de358a9d 100644
--- a/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs
@@ -290,7 +290,8 @@ public async Task UpdateSelectedItemPreviewAsync(bool downloadItem = false)
 				{
 					PreviewPaneState = PreviewPaneStates.LoadingPreview;
 
-					if (previewSettingsService.ShowPreviewOnly)
+					if (previewSettingsService.ShowPreviewOnly ||
+						SelectedItem?.PrimaryItemAttribute == StorageItemTypes.Folder)
 					{
 						loadCancellationTokenSource = new CancellationTokenSource();
 						await LoadPreviewControlAsync(loadCancellationTokenSource.Token, downloadItem);