Index: components/nsSEOrganizer.js
===================================================================
--- components/nsSEOrganizer.js	(revision 384)
+++ components/nsSEOrganizer.js	(working copy)
@@ -875,16 +875,19 @@
     "GetSources", "GetTarget", "GetTargets", "hasArcIn", "hasArcOut",
     "HasAssertion", "IsCommandEnabled", "Move", "Unassert"
   ].forEach((k) => {
-    this[k] = () => {
-      if (this._outOfDate)
-        this._update();
+    let This = this;
+    this[k] = function() {
+      if (This._outOfDate)
+        This._update();
 
-      let ds = this._rootContainer.DataSource;
+      let ds = This._rootContainer.DataSource;
       return ds[k].apply(ds, arguments);
     };
   });
 
   Services.obs.addObserver(this, "browser-search-engine-modified", false);
+
+  this._update();
 }
 FoldersOnly.prototype = {
   classDescription: "For Organizing search engines in folders.",
Index: content/confirmAddEngine.js
===================================================================
--- content/confirmAddEngine.js	(revision 384)
+++ content/confirmAddEngine.js	(working copy)
@@ -37,7 +37,6 @@
 ***** END LICENSE BLOCK ***** */
 
 Components.utils.import("resource://gre/modules/Services.jsm");
-const Cc = Components.classes, Ci = Components.interfaces;
 
 var organizeSE = {
   onEngineListChange: function organizeSE__onEngineListChange(item) {
Index: content/confirmAddEngine.xul
===================================================================
--- content/confirmAddEngine.xul	(revision 384)
+++ content/confirmAddEngine.xul	(working copy)
@@ -56,6 +56,9 @@
         buttonpack="center"
         buttons="accept,cancel">
 
+  <script type="application/x-javascript">
+    const Cc = Components.classes, Ci = Components.interfaces;
+  </script>
   <script type="application/x-javascript" src="chrome://seorganizer/content/confirmAddEngine.js"/>
 
   <hbox flex="1">
Index: content/searchServiceModifications.js
===================================================================
--- content/searchServiceModifications.js	(revision 384)
+++ content/searchServiceModifications.js	(working copy)
@@ -59,6 +59,11 @@
     var sbs = Cc["@mozilla.org/intl/stringbundle;1"].getService(Ci.nsIStringBundleService);
     var stringBundle = sbs.createBundle(SEARCH_BUNDLE);
 
+    let allKeys = XPCOMUtils.IterSimpleEnumerator(stringBundle.getSimpleEnumeration(),
+                                                  Ci.nsIPropertyElement);
+    let keyCandidates = ["addEngineAsCurrentText", "addEngineUseNowText"];
+    let useNowTexts = [ i.value for each (i in allKeys) if (keyCandidates.indexOf(i.key) != -1)];
+
     var args = {
 
       titleMessage: stringBundle.GetStringFromName("addEngineConfirmTitle"),
@@ -67,7 +72,7 @@
       dialogMessage: stringBundle.formatStringFromName("addEngineConfirmation",
                                                [this._name, this._uri.host], 2),
 
-      checkboxMessage: stringBundle.GetStringFromName("addEngineAsCurrentText"),
+      checkboxMessage: useNowTexts[0],
 
       addButtonLabel: stringBundle.GetStringFromName("addEngineAddButtonLabel"),
       
