diff --git a/Src/xWorks/XhtmlDocView.cs b/Src/xWorks/XhtmlDocView.cs
index 623336badb..d551978bc9 100644
--- a/Src/xWorks/XhtmlDocView.cs
+++ b/Src/xWorks/XhtmlDocView.cs
@@ -1350,8 +1350,11 @@ public FindDialog(XhtmlDocView doc)
private void FindPrevInBrowser(object sender, IBasicFindView view)
{
var geckoBrowser = docView.m_mainView.NativeBrowser as GeckoWebBrowser;
- if (geckoBrowser == null)
+ if (geckoBrowser == null || geckoBrowser.Document == null)
+ {
+ this.Close();
return;
+ }
string lastId = Guid.Empty.ToString();
if (!InitResults(view.SearchText))
{
@@ -1366,8 +1369,11 @@ private void FindPrevInBrowser(object sender, IBasicFindView view)
private void FindNextInBrowser(object sender, IBasicFindView view)
{
var geckoBrowser = docView.m_mainView.NativeBrowser as GeckoWebBrowser;
- if (geckoBrowser == null)
+ if (geckoBrowser == null || geckoBrowser.Document == null)
+ {
+ this.Close();
return;
+ }
string lastId = Guid.Empty.ToString();
if(!InitResults(view.SearchText))
{