diff --git a/mozilla/xpfe/browser/resources/content/navigator.js b/mozilla/xpfe/browser/resources/content/navigator.js
index c50c335773a..856dfd3401b 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.js
+++ b/mozilla/xpfe/browser/resources/content/navigator.js
@@ -1668,6 +1668,7 @@ function setFormToolbar()
   if (cmd_viewformToolbar) {
     var checkValue = cmd_viewformToolbar.getAttribute("checked");
     if (checkValue == "false") {
+      formToolbar.setAttribute("hidden", "true");
       return;
     }
   }
@@ -1676,6 +1677,7 @@ function setFormToolbar()
 
   var formToolbar = document.getElementById("FormToolbar");
   if (!formToolbar) {
+    formToolbar.setAttribute("hidden", "true");
     return;
   }
   if (!window._content.document) {
diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 081072131b4..30ef224f3d1 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -284,7 +284,7 @@ Contributor(s): ______________________________________. -->
 
     <!-- Form toolbar items -->
     <toolbar id="FormToolbar" class="chromeclass-directories"
-             persist="collapsed" onload="alert('hi');">
+             persist="collapsed" hidden="true">
         <button class="button-toolbar-3 top" id="formPrefill" crop="right"
                 oncommand="formPrefill();"
                 value="&formPrefill.label;" tooltip="aTooltip" tooltiptext="&formPrefill.tooltip;"/>
diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index 8a9f7880458..7372d166b53 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -125,7 +125,7 @@
 	<broadcaster id="cmd_viewTextZoomEnlarge" value="&textZoomEnlargeCmd.label;"   oncommand="enlargeTextZoom();"/>
 	<broadcaster id="cmd_viewnavbar" value="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
 	<broadcaster id="cmd_viewpersonaltoolbar" value="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
-	<broadcaster id="cmd_viewformtoolbar" value="&formbarCmd.label;" accesskey="&formbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleFormToolbar('FormToolbar','cmd_viewformtoolbar');" checked="true"/>
+	<broadcaster id="cmd_viewformtoolbar" value="&formbarCmd.label;" accesskey="&formbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleFormToolbar('FormToolbar','cmd_viewformtoolbar');" checked="false"/>
 	<broadcaster id="cmd_viewtaskbar" value="&taskbarCmd.label;" accesskey="&taskbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
 
 	<broadcaster id="View:PageSource" oncommand="BrowserViewSource();"/>