diff --git a/mozilla/layout/forms/resources/content/select.xml b/mozilla/layout/forms/resources/content/select.xml
index 0d1dab1fcf7..13f6fb71680 100644
--- a/mozilla/layout/forms/resources/content/select.xml
+++ b/mozilla/layout/forms/resources/content/select.xml
@@ -679,9 +679,9 @@
       </handler>
       <handler event="keypress">
         <![CDATA[
+          var c = this.currentIndex;
           if (event.keyCode == ' '.charCodeAt(0)) {
             event.preventDefault();
-            var c = this.currentIndex;
             var selection = this.treeBoxObject.selection;
             if (event.ctrlKey || !selection.isSelected(c)) {
               selection.toggleSelect(c);
@@ -694,7 +694,6 @@
             }
           } else if (event.keyCode == '+' || event.keyCode == '-') {
              event.preventDefault();
-             var c = this.currentIndex;
              var view = this.view;
              var elem = this.contentView.getItemAtIndex(c);
              if (elem.tagName.toLowerCase() == "optgroup" && !elem.disabled &&
diff --git a/mozilla/layout/html/forms/resources/content/select.xml b/mozilla/layout/html/forms/resources/content/select.xml
index 0d1dab1fcf7..13f6fb71680 100644
--- a/mozilla/layout/html/forms/resources/content/select.xml
+++ b/mozilla/layout/html/forms/resources/content/select.xml
@@ -679,9 +679,9 @@
       </handler>
       <handler event="keypress">
         <![CDATA[
+          var c = this.currentIndex;
           if (event.keyCode == ' '.charCodeAt(0)) {
             event.preventDefault();
-            var c = this.currentIndex;
             var selection = this.treeBoxObject.selection;
             if (event.ctrlKey || !selection.isSelected(c)) {
               selection.toggleSelect(c);
@@ -694,7 +694,6 @@
             }
           } else if (event.keyCode == '+' || event.keyCode == '-') {
              event.preventDefault();
-             var c = this.currentIndex;
              var view = this.view;
              var elem = this.contentView.getItemAtIndex(c);
              if (elem.tagName.toLowerCase() == "optgroup" && !elem.disabled &&
diff --git a/mozilla/xpfe/global/resources/content/bindings/tree.xml b/mozilla/xpfe/global/resources/content/bindings/tree.xml
index 2dca8fe9b41..86546808540 100644
--- a/mozilla/xpfe/global/resources/content/bindings/tree.xml
+++ b/mozilla/xpfe/global/resources/content/bindings/tree.xml
@@ -591,8 +591,8 @@
       </handler>
       <handler event="keypress">
         <![CDATA[
+         var c = this.currentIndex;
          if (event.keyCode == ' '.charCodeAt(0)) {
-           var c = this.currentIndex;
            if (!this.treeBoxObject.selection.isSelected(c))
              this.treeBoxObject.selection.toggleSelect(c);
          }
@@ -610,7 +610,6 @@
            
            var primarycol = this.treeBoxObject.getKeyColumnIndex();
            var colID = this.treeBoxObject.getColumnID(primarycol);
-           var c = this.currentIndex;
            var rowCount = this.treeBoxObject.view.rowCount;
            var start = 1;