diff --git a/mail/components/compose/content/dialogs/EdReplace.js b/mail/components/compose/content/dialogs/EdReplace.js
index c937702416..eebcfbe443 100644
--- a/mail/components/compose/content/dialogs/EdReplace.js
+++ b/mail/components/compose/content/dialogs/EdReplace.js
@@ -10,6 +10,10 @@ var gFindInst; // nsIWebBrowserFind that we're going to use
var gFindService; // Global service which remembers find params
var gEditor; // the editor we're using
+window.addEventListener("load", event => {
+ onLoad();
+});
+
document.addEventListener("dialogaccept", event => {
onFindNext();
event.preventDefault();
diff --git a/mail/components/compose/content/dialogs/EdReplace.xhtml b/mail/components/compose/content/dialogs/EdReplace.xhtml
index e75dba7abe..8ef846e080 100644
--- a/mail/components/compose/content/dialogs/EdReplace.xhtml
+++ b/mail/components/compose/content/dialogs/EdReplace.xhtml
@@ -1,132 +1,144 @@
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+