comments

Author: yaira2

src/Files.App/Actions/Show/ToggleFilterHeaderAction.cs

@@ -32,7 +32,10 @@ public Task ExecuteAsync(object? parameter = null)
 			if (IsOn)
 				ContentPageContext.ShellPage!.ShellViewModel.InvokeFocusFilterHeader();
 			else
+			{
+				// Clear the filter query when the header is hidden
 				ContentPageContext.ShellPage!.ShellViewModel.FilesAndFoldersFilter = string.Empty;
+			}
 
 			return Task.CompletedTask;
 		}

src/Files.App/Views/MainPage.xaml.cs

@@ -216,8 +216,10 @@ private async Task OnPreviewKeyDownAsync(KeyRoutedEventArgs e)
 					if (source?.FindAscendantOrSelf<TextBox>() is not null)
 						break;
 
-					// Prevent the back key from executing a command if the filter header is not empty
-					if (e.Key is VirtualKey.Back && UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems && !string.IsNullOrEmpty(SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn!.ShellViewModel.FilesAndFoldersFilter))
+					// Prevent the back key from executing a command if the keyboard typing behavior is set to filter items and a filter is currently applied.
+					if (e.Key is VirtualKey.Back &&
+						UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems &&
+						!string.IsNullOrEmpty(SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn!.ShellViewModel.FilesAndFoldersFilter))
 						break;
 
 					// Execute command for hotkey