diff --git a/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs b/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs
index 8e06f242c1ed..6d86de358a9d 100644
--- a/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs
+++ b/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs
@@ -290,13 +290,17 @@ 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);
 					}
 					else
+					{
 						await LoadBasicPreviewAsync();
+						return;
+					}
 				}
 				catch (Exception e)
 				{