From d26b620f8dca3a80d8a1f0311d4a7cd8498a8f7c Mon Sep 17 00:00:00 2001
From: nathan <nathangray.bsc+github@gmail.com>
Date: Mon, 9 Sep 2024 11:41:51 -0600
Subject: [PATCH] Fix currentResult got set to invalid node if results were
 re-rendered

---
 api/js/etemplate/Et2Widget/SearchMixin.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/api/js/etemplate/Et2Widget/SearchMixin.ts b/api/js/etemplate/Et2Widget/SearchMixin.ts
index 65b2245377..f354c71f05 100644
--- a/api/js/etemplate/Et2Widget/SearchMixin.ts
+++ b/api/js/etemplate/Et2Widget/SearchMixin.ts
@@ -594,7 +594,11 @@ export const SearchMixin = <T extends Constructor<Et2InputWidgetInterface &
 					this.requestUpdate("resultsOpen", false)
 				}
 				event.stopPropagation();
-				this.setCurrentResult(this.currentResult ?? this._resultNodes[0]);
+
+				this.setCurrentResult(
+					this.currentResult && this.contains(this.currentResult) ?
+					this.currentResult : this._resultNodes[0]
+				);
 				return;
 			}