From e81ea8084c95f0c39cbe6f4aae4639ed169d4097 Mon Sep 17 00:00:00 2001
From: John Maxwell <maxwellparc@gmail.com>
Date: Wed, 24 Jun 2026 08:55:49 -0700
Subject: [PATCH] Fix new problem with LT-22520: Crash when using Find window

---
 Src/xWorks/GeneratedHtmlViewer.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Src/xWorks/GeneratedHtmlViewer.cs b/Src/xWorks/GeneratedHtmlViewer.cs
index 1ece8d24ca..a4278e4e87 100644
--- a/Src/xWorks/GeneratedHtmlViewer.cs
+++ b/Src/xWorks/GeneratedHtmlViewer.cs
@@ -1037,6 +1037,10 @@ private void OnDomKeyPress(object sender, DomKeyEventArgs e)
 		}
 		private void FindDialog_FormClosing(object sender, FormClosingEventArgs e)
 		{
+			if (m_htmlControl?.Browser?.Window == null)
+			{
+				return;
+			}
 			using (var executor = new AutoJSContext(m_htmlControl.Browser.Window))
 			{
 				// Javascript query to execute in the browser
@@ -1102,8 +1106,11 @@ private void FindNextInBrowser(object sender, IBasicFindView view)
 
 			private void FindInBrowser(bool forward)
 			{
-				if (geckoBrowser == null)
+				if (geckoBrowser?.Window == null)
+				{
+					Close();
 					return;
+				}
 				int originalResultIndex = resultIndex;
 				using (var executor = new AutoJSContext(geckoBrowser.Window))
 				{