diff --git a/extensions/help/resources/content/help.xul b/extensions/help/resources/content/help.xul
index 8b6c075e55a..57195a21c2b 100644
--- a/extensions/help/resources/content/help.xul
+++ b/extensions/help/resources/content/help.xul
@@ -22,7 +22,7 @@
    windowtype="mozilla:help"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    width="640"
-   height="650"
+   height="550"
    persist="width height screenX screenY"
    onload="init();" >
 
@@ -118,8 +118,109 @@
     <!-- the two help panes (sidebar & content) -->
     <hbox flex="1">
       <vbox id="helpsidebar-box" persist="width">
+
+         <!-- glossary panel -->
+         <button id="help-glossary-btn" class="box-texttab texttab-sidebar"
+            label="&glossarytab.label;" oncommand="showPanel('help-glossary-tree')"/>
+         <tree id="help-glossary-tree" flex="1" hidecolumnpicker="true" hidden="true"
+               datasources="rdf:null"
+               containment="http://home.netscape.com/NC-rdf#subheadings"
+               ref="urn:root"
+               flags="dont-build-content"
+               onselect="onselect_loadURI(this, 'GlossaryNameColumn')">
+        <template>
+          <rule>
+          <conditions>
+            <treeitem uri="?uri"/>
+            <triple subject="?uri"
+              predicate="http://home.netscape.com/NC-rdf#subheadings"
+              object="?subheadings" />
+            <member container="?subheadings" child="?subheading"/>
+          </conditions>
+          <bindings>
+            <binding subject="?subheading"
+              predicate="http://home.netscape.com/NC-rdf#name"
+              object="?name" />
+
+            <binding subject="?subheading"
+              predicate="http://home.netscape.com/NC-rdf#link"
+              object="?link" />
+          </bindings>
+
+          <action>
+            <treechildren>
+              <treeitem uri="?subheading">
+                <treerow>
+                  <treecell label="?name"
+                    properties="link-?link"/>
+                </treerow>
+              </treeitem>
+            </treechildren>
+          </action>
+          </rule>
+        </template>
+            <treecols>
+               <treecol id="GlossaryNameColumn" flex="1"
+                  hideheader="true"
+                  primary="true"/>
+            </treecols>
+         </tree>
+
+	 <!-- index panel -->
+         <button id="help-index-btn" class="box-texttab texttab-sidebar"
+            label="&indextab.label;"  oncommand="showPanel('help-index-tree');displayIndex();"/>
+
+         <tree id="help-index-tree" flex="1"
+               datasources="rdf:null" hidecolumnpicker="true" hidden="true"
+               containment="http://home.netscape.com/NC-rdf#subheadings"
+               ref="urn:root"
+               flags="dont-build-content dont-test-empty"
+               onselect="onselect_loadURI(this, 'IndexNameColumn')">
+        <template>
+          <rule>
+          <conditions>
+            <treeitem uri="?uri"/>
+            <triple subject="?uri"
+              predicate="http://home.netscape.com/NC-rdf#subheadings"
+              object="?subheadings" />
+            <member container="?subheadings" child="?subheading"/>
+          </conditions>
+          <bindings>
+            <binding subject="?subheading"
+              predicate="http://home.netscape.com/NC-rdf#name"
+              object="?name" />
+
+            <binding subject="?subheading"
+              predicate="http://home.netscape.com/NC-rdf#link"
+              object="?link" />
+          </bindings>
+
+          <action>
+            <treechildren>
+              <treeitem uri="?subheading">
+                <treerow>
+                  <treecell ref="IndexNameColumn" label="?name"
+                      properties="link-?link"/>
+                </treerow>
+              </treeitem>
+            </treechildren>
+          </action>
+          </rule>
+        </template>
+            <treecols>
+               <treecol id="IndexNameColumn" flex="1"
+                  hideheader="true"
+                  primary="true"
+                  sortActive="true"
+                  sortDirection="ascending"
+                  sort="?name"/>
+            </treecols>
+         </tree>
+
+     <!-- search panel -->
      <button id="help-search-btn" class="box-texttab texttab-sidebar"
              label="&searchtab.label;" oncommand="showPanel('help-search-panel')"/>
+
              <vbox id="help-search-panel" hidden="true" flex="1">
                 <hbox align="center">
                   <textbox id="findText" 
@@ -174,6 +275,7 @@
           </tree>
        </vbox>
 
+       <!-- table of contents panel -->
        <button id="help-toc-btn" class="box-texttab texttab-sidebar"
           label="&toctab.label;" oncommand="showPanel('help-toc-tree')"/>
           <tree id="help-toc-tree" flex="1"  hidecolumnpicker="true"
@@ -219,101 +321,7 @@
             </treecols>
          </tree>
 
-         <button id="help-index-btn" class="box-texttab texttab-sidebar"
-            label="&indextab.label;"  oncommand="showPanel('help-index-tree');displayIndex();"/>
 
-         <tree id="help-index-tree" flex="1"
-               datasources="rdf:null" hidecolumnpicker="true" hidden="true"
-               containment="http://home.netscape.com/NC-rdf#subheadings"
-               ref="urn:root"
-               flags="dont-build-content dont-test-empty"
-               onselect="onselect_loadURI(this, 'IndexNameColumn')">
-        <template>
-          <rule>
-          <conditions>
-            <treeitem uri="?uri"/>
-            <triple subject="?uri"
-              predicate="http://home.netscape.com/NC-rdf#subheadings"
-              object="?subheadings" />
-            <member container="?subheadings" child="?subheading"/>
-          </conditions>
-          <bindings>
-            <binding subject="?subheading"
-              predicate="http://home.netscape.com/NC-rdf#name"
-              object="?name" />
-
-            <binding subject="?subheading"
-              predicate="http://home.netscape.com/NC-rdf#link"
-              object="?link" />
-          </bindings>
-
-          <action>
-            <treechildren>
-              <treeitem uri="?subheading">
-                <treerow>
-                  <treecell ref="IndexNameColumn" label="?name"
-                      properties="link-?link"/>
-                </treerow>
-              </treeitem>
-            </treechildren>
-          </action>
-          </rule>
-        </template>
-            <treecols>
-               <treecol id="IndexNameColumn" flex="1"
-                  hideheader="true"
-                  primary="true"
-                  sortActive="true"
-                  sortDirection="ascending"
-                  sort="?name"/>
-            </treecols>
-         </tree>
-
-         <button id="help-glossary-btn" class="box-texttab texttab-sidebar"
-            label="&glossarytab.label;" oncommand="showPanel('help-glossary-tree')"/>
-         <tree id="help-glossary-tree" flex="1" hidecolumnpicker="true" hidden="true"
-               datasources="rdf:null"
-               containment="http://home.netscape.com/NC-rdf#subheadings"
-               ref="urn:root"
-               flags="dont-build-content"
-               onselect="onselect_loadURI(this, 'GlossaryNameColumn')">
-        <template>
-          <rule>
-          <conditions>
-            <treeitem uri="?uri"/>
-            <triple subject="?uri"
-              predicate="http://home.netscape.com/NC-rdf#subheadings"
-              object="?subheadings" />
-            <member container="?subheadings" child="?subheading"/>
-          </conditions>
-          <bindings>
-            <binding subject="?subheading"
-              predicate="http://home.netscape.com/NC-rdf#name"
-              object="?name" />
-
-            <binding subject="?subheading"
-              predicate="http://home.netscape.com/NC-rdf#link"
-              object="?link" />
-          </bindings>
-
-          <action>
-            <treechildren>
-              <treeitem uri="?subheading">
-                <treerow>
-                  <treecell label="?name"
-                    properties="link-?link"/>
-                </treerow>
-              </treeitem>
-            </treechildren>
-          </action>
-          </rule>
-        </template>
-            <treecols>
-               <treecol id="GlossaryNameColumn" flex="1"
-                  hideheader="true"
-                  primary="true"/>
-            </treecols>
-         </tree>
 
       </vbox>
 
diff --git a/extensions/help/resources/locale/en-US/mozillahelp.rdf b/extensions/help/resources/locale/en-US/mozillahelp.rdf
index ff7c502c2e0..eb9b85dba6e 100755
--- a/extensions/help/resources/locale/en-US/mozillahelp.rdf
+++ b/extensions/help/resources/locale/en-US/mozillahelp.rdf
@@ -9,10 +9,11 @@
           nc:base="chrome://help/locale/">
     <nc:panellist>
       <rdf:Seq>
-        <rdf:li> <rdf:Description nc:panelid="search" nc:datasources="search-db.rdf"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:panelid="toc" nc:datasources="help-toc.rdf"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:panelid="index" nc:datasources="help-indexAZ.rdf help-index1.rdf"/> </rdf:li>
         <rdf:li> <rdf:Description nc:panelid="glossary" nc:datasources="help-glossary.rdf"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:panelid="index" nc:datasources="help-indexAZ.rdf help-index1.rdf"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:panelid="search" nc:datasources="search-db.rdf"
+        					nc:emptysearchtext="[No matching items found.]" nc:emptysearchlink="help-help-window"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:panelid="toc" nc:datasources="help-toc.rdf"/> </rdf:li>
       </rdf:Seq>
     </nc:panellist>
   </rdf:Description>