diff --git a/mozilla/toolkit/content/widgets/listbox.xml b/mozilla/toolkit/content/widgets/listbox.xml
index b89f2a300ef..b3db00a0da9 100644
--- a/mozilla/toolkit/content/widgets/listbox.xml
+++ b/mozilla/toolkit/content/widgets/listbox.xml
@@ -228,7 +228,7 @@
 
       <property name="currentIndex">
         <getter><![CDATA[
-          return this.getIndexOfItem(this.currentItem);
+          return this.currentItem ? this.getIndexOfItem(this.currentItem) : -1;
         ]]></getter>
         <setter><![CDATA[
           if (val >= 0)
@@ -504,6 +504,19 @@
     </implementation>
     
     <handlers>
+      <handler event="focus">
+        <![CDATA[
+          if (this.currentIndex == -1 && this.getRowCount() > 0) {
+            this.currentItem = getItemAtIndex(0);  // focus first item
+            if (this.selType != 'multiple') {
+              // In single selection trees the selection should be the same
+              // as the focus
+              this.timedSelect(currentItem, this._selectDelay);
+            }
+            this.ensureIndexIsVisible(0);
+          }
+        ]]>
+      </handler>
       <handler event="keypress" keycode="vk_up" phase="target">
         <![CDATA[
          if (this.selectedItems.length < 1)
diff --git a/mozilla/toolkit/content/widgets/tree.xml b/mozilla/toolkit/content/widgets/tree.xml
index 4e9fc1d11d7..4f2ac2ba4b3 100644
--- a/mozilla/toolkit/content/widgets/tree.xml
+++ b/mozilla/toolkit/content/widgets/tree.xml
@@ -246,7 +246,18 @@
             this.treeBoxObject.scrollByLines(rows);
         ]]>
       </handler>
-      <handler event="focus" action="this.treeBoxObject.focused = true;"/>
+      <handler event="focus">
+        <![CDATA[
+          this.treeBoxObject.focused = true;
+          if (this.currentIndex == -1 && this.view.rowCount > 0) {
+            this.currentIndex = 0;
+            if (this.view.selection.single) {
+              this.view.selection.select(0);
+            }
+            this.treeBoxObject.ensureRowIsVisible(0);
+          }
+        ]]>
+      </handler>
       <handler event="blur" action="this.treeBoxObject.focused = false;"/>
       <handler event="keypress" keycode="vk_enter" action="this.changeOpenState(this.currentIndex);"/>
       <handler event="keypress" keycode="vk_return" action="this.changeOpenState(this.currentIndex);"/>