diff --git a/browser/base/content/search.xml b/browser/base/content/search.xml
index ce394ad6e8c..fa67c8ae836 100644
--- a/browser/base/content/search.xml
+++ b/browser/base/content/search.xml
@@ -157,7 +157,7 @@
 
       <method name="_initializeEngine">
         <body><![CDATA[
-          var selectedEngineName = null;
+          var selectedEngineName;
           try {
             selectedEngineName = 
                     this.prefService
@@ -169,7 +169,8 @@
           this.currentEngineName = selectedEngineName;
 
           // check to see whether it failed
-          if (!this.currentEngine)
+          var engine = this.currentEngine;
+          if (!engine)
             this.currentEngine = this.getDefaultEngine();
         ]]></body>
       </method>
@@ -249,12 +250,12 @@
             var name = this.readRDFString(rEngine, kNC_Name);
             if (name == aName) {
               this.currentEngine = rEngine.Value;
-              this.parentNode.setAttribute("searchenginename", name);
+              this.parentNode.setAttribute('searchenginename', name);
               return true;
             }
           }
           this.currentEngine = null;
-          this.parentNode.removeAttribute("searchenginename")
+          this.parentNode.removeAttribute('searchenginename')
           return false;
         ]]></body>
       </method>
