diff --git a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs index c3d9ee6873b3..0fc66c0bcc11 100644 --- a/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs @@ -942,8 +942,14 @@ public async Task PopulateOmnibarSuggestionsForPathMode() void AddNoResultsItem() { PathModeSuggestionItems.Clear(); + + // Use null-safe access to avoid NullReferenceException during app lifecycle transitions + var workingDirectory = string.IsNullOrEmpty(ContentPageContext.ShellPage?.ShellViewModel?.WorkingDirectory) + ? Constants.UserEnvironmentPaths.HomePath + : ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory; + PathModeSuggestionItems.Add(new( - ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory, + workingDirectory, Strings.NavigationToolbarVisiblePathNoResults.GetLocalizedResource())); } }