diff --git a/xpfe/components/find/resources/finddialog.js b/xpfe/components/find/resources/finddialog.js
index 49f884793af..0b323d93a2d 100644
--- a/xpfe/components/find/resources/finddialog.js
+++ b/xpfe/components/find/resources/finddialog.js
@@ -27,6 +27,7 @@
             dialog.find            = document.getElementById("ok");
             dialog.cancel          = document.getElementById("cancel");
             dialog.enabled         = false;
+            dialog.bundle          = document.getElementById("findBundle");
         }
 
         function loadDialog()
@@ -112,7 +113,9 @@
             loadData();
 
             // Search.
-            finder.findNext( data );
+            var result = finder.findNext( data );
+            if (!result)
+                window.alert(dialog.bundle.getString("notFoundWarning"));
 
             // don't close the window
             return false;
diff --git a/xpfe/components/find/resources/finddialog.xul b/xpfe/components/find/resources/finddialog.xul
index 610f0ee889f..a9cb41ab9e9 100644
--- a/xpfe/components/find/resources/finddialog.xul
+++ b/xpfe/components/find/resources/finddialog.xul
@@ -45,8 +45,8 @@ Contributor(s): Stuart Parmenter <pavlov@netscape.com>
   persist="screenX screenY"
   screenX="24" screenY="24">
 
-  <html:script language="JavaScript" src="chrome://global/content/finddialog.js"/>
-
+  <script language="JavaScript" src="chrome://global/content/finddialog.js"/>
+  <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
   <box>
   
     <!-- hack. we seem to need this separator to get it to render -->
diff --git a/xpfe/components/find/resources/locale/en-US/finddialog.properties b/xpfe/components/find/resources/locale/en-US/finddialog.properties
new file mode 100644
index 00000000000..7d9de5d972b
--- /dev/null
+++ b/xpfe/components/find/resources/locale/en-US/finddialog.properties
@@ -0,0 +1 @@
+notFoundWarning=The text you entered was not found.
diff --git a/xpfe/components/jar.mn b/xpfe/components/jar.mn
index 15530997604..a45e76eca82 100644
--- a/xpfe/components/jar.mn
+++ b/xpfe/components/jar.mn
@@ -162,6 +162,7 @@ en-US.jar:
     locale/en-US/global/console.dtd                             (console/resources/locale/en-US/console.dtd)
     locale/en-US/global/console.properties                      (console/resources/locale/en-US/console.properties)
     locale/en-US/global/finddialog.dtd                          (find/resources/locale/en-US/finddialog.dtd)
+    locale/en-US/global/finddialog.properties                          (find/resources/locale/en-US/finddialog.properties)
 
 toolkit.jar:
     content/global/console.js                                   (console/resources/content/console.js)