From fba8e4536bf2ff38aa74b1f7761cbfa2756cdd82 Mon Sep 17 00:00:00 2001
From: Ashish Aggarwal <ashish.aggarwal@autodesk.com>
Date: Fri, 8 Dec 2023 14:37:41 -0500
Subject: [PATCH] add unsub

---
 .../Controls/NodeAutoCompleteSearchControl.xaml.cs           | 3 ++-
 .../ViewModels/Search/NodeAutoCompleteSearchViewModel.cs     | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs b/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs
index 217a5dbb8cc..418db248934 100644
--- a/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs
+++ b/src/DynamoCoreWpf/Controls/NodeAutoCompleteSearchControl.xaml.cs
@@ -365,12 +365,13 @@ private void OnMoreInfoClicked(object sender, RoutedEventArgs e)
 
         internal void CloseAutocompletionWindow(object sender, RoutedEventArgs e)
         {
-            OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);
+            CloseAutoCompletion();
         }
 
         internal void CloseAutoCompletion()
         {
             OnRequestShowNodeAutoCompleteSearch(ShowHideFlags.Hide);
+            ViewModel.OnNodeAutoCompleteWindowClosed();
         }
 
         /// <summary>
diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
index c3ab92972ad..3870188c4ab 100644
--- a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
@@ -598,6 +598,11 @@ internal void PopulateDefaultAutoCompleteCandidates()
             }
         }
 
+        internal void OnNodeAutoCompleteWindowClosed()
+        {
+            dynamoViewModel.CurrentSpaceViewModel.Model.NodeRemoved -= NodeViewModel_Removed;
+        }
+
         internal void NodeViewModel_Removed(NodeModel node)
         {
             ParentNodeRemoved?.Invoke(node);