From 25e8b30f96f9d7a330208062726b71276a0ee620 Mon Sep 17 00:00:00 2001
From: Saravanan G <workbysaran@gmail.com>
Date: Tue, 12 May 2026 10:39:38 +0530
Subject: [PATCH] Fix: Fixed an issue where Smart extract decompresses to wrong
 folder on tab switch

---
 .../Archives/Decompress/BaseDecompressArchiveAction.cs     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs b/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs
index 3cf8b8123ebe..b5718945f81c 100644
--- a/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs
+++ b/src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs
@@ -55,11 +55,14 @@ protected async Task DecompressArchiveHereAsync(bool smart = false)
 			if (context.SelectedItems.Count is 0)
 				return;
 
-			foreach (var selectedItem in context.SelectedItems)
+			var selectedItems = context.SelectedItems.ToList();
+			var currentFolderPath = context.ShellPage?.ShellViewModel.CurrentFolder?.ItemPath ?? string.Empty;
+			BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(currentFolderPath);
+
+			foreach (var selectedItem in selectedItems)
 			{
 				var password = string.Empty;
 				BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(selectedItem.ItemPath);
-				BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(context.ShellPage?.ShellViewModel.CurrentFolder?.ItemPath ?? string.Empty);
 
 				if (archive?.Path is null)
 					return;