From 76cbec19b1e139ba7bfbc2972b72c83b0259c126 Mon Sep 17 00:00:00 2001
From: "Aaron (Qilong)" <173288704@qq.com>
Date: Mon, 18 Nov 2024 09:59:32 -0500
Subject: [PATCH] DYN-7820 Fix regression (#15666)

---
 .../ViewModels/PackageManager/PackageManagerSearchViewModel.cs  | 2 +-
 src/LibraryViewExtensionWebView2/ViewExtension.cs               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
index b40bd63ac6d..60eacd1af20 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -186,7 +186,7 @@ private void SetFilterHosts(object obj)
                     Dynamo.Logging.Analytics.TrackEvent(
                         Actions.Filter,
                         Categories.PackageManagerOperations,
-                        pmSearchViewModel.CompatibilityFilter.FirstOrDefault(x=>x.OnChecked).FilterName);
+                        pmSearchViewModel.CompatibilityFilter.FirstOrDefault(x=>x.OnChecked)?.FilterName);
                 }
                 pmSearchViewModel.SearchAndUpdateResults();
                 return;
diff --git a/src/LibraryViewExtensionWebView2/ViewExtension.cs b/src/LibraryViewExtensionWebView2/ViewExtension.cs
index 361cfbb27ce..e543148877b 100644
--- a/src/LibraryViewExtensionWebView2/ViewExtension.cs
+++ b/src/LibraryViewExtensionWebView2/ViewExtension.cs
@@ -43,8 +43,8 @@ public void Loaded(ViewLoadedParams viewLoadedParams)
                 viewParams = viewLoadedParams;
                 controller = new LibraryViewController(viewLoadedParams.DynamoWindow, viewLoadedParams.CommandExecutive, customization);
                 (viewLoadedParams.DynamoWindow.DataContext as DynamoViewModel).PropertyChanged += handleDynamoViewPropertyChanges;
+                viewParams.CurrentWorkspaceChanged += ViewParams_CurrentWorkspaceChanged;
             }
-            viewParams.CurrentWorkspaceChanged += ViewParams_CurrentWorkspaceChanged;
         }
 
         private void ViewParams_CurrentWorkspaceChanged(IWorkspaceModel workspace)