diff --git a/extensions/wallet/cookieviewer/CookieViewer.js b/extensions/wallet/cookieviewer/CookieViewer.js
index 240c5b8608c4..6cda447d7810 100644
--- a/extensions/wallet/cookieviewer/CookieViewer.js
+++ b/extensions/wallet/cookieviewer/CookieViewer.js
@@ -452,8 +452,11 @@ function getSelectedTab()
   return key;
 }
 
-
 function doHelpButton() {
-   var uri = getSelectedTab();
-   openHelp(uri);
+  if (isImages) {
+    openHelp("image_mgr");
+  } else {
+    var uri = getSelectedTab();
+    openHelp(uri);
+  }
 }
diff --git a/extensions/wallet/editor/WalletViewer.js b/extensions/wallet/editor/WalletViewer.js
index f222ab0c1d56..326bf9dc5845 100644
--- a/extensions/wallet/editor/WalletViewer.js
+++ b/extensions/wallet/editor/WalletViewer.js
@@ -442,3 +442,7 @@ nsWalletViewer.prototype =
     return true;
   }
 
+  // called by the help button overlaid from platformDialogOverlay
+  function doHelpButton() {
+    openHelp("forms_data");
+  }
diff --git a/extensions/wallet/editor/WalletViewer.xul b/extensions/wallet/editor/WalletViewer.xul
index fa4a399c636e..afe45d26ba8c 100644
--- a/extensions/wallet/editor/WalletViewer.xul
+++ b/extensions/wallet/editor/WalletViewer.xul
@@ -36,14 +36,12 @@
       // centerWindowOnScreen();
       
     }
-  
   ]]>
-  
   </script>        
         
   <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletViewer.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-
+  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
   <keyset id="dialogKeys"/>
 
   <hbox flex="1">
@@ -57,7 +55,7 @@
 
   <separator/>
 
-  <hbox id="okCancelButtonsRight" />
+  <hbox id="okCancelHelpButtonsRight" />
 
   <script type="application/x-javascript">
     <![CDATA[
diff --git a/extensions/wallet/editor/resources/content/WalletViewer.js b/extensions/wallet/editor/resources/content/WalletViewer.js
index f222ab0c1d56..326bf9dc5845 100644
--- a/extensions/wallet/editor/resources/content/WalletViewer.js
+++ b/extensions/wallet/editor/resources/content/WalletViewer.js
@@ -442,3 +442,7 @@ nsWalletViewer.prototype =
     return true;
   }
 
+  // called by the help button overlaid from platformDialogOverlay
+  function doHelpButton() {
+    openHelp("forms_data");
+  }
diff --git a/extensions/wallet/editor/resources/content/WalletViewer.xul b/extensions/wallet/editor/resources/content/WalletViewer.xul
index fa4a399c636e..afe45d26ba8c 100644
--- a/extensions/wallet/editor/resources/content/WalletViewer.xul
+++ b/extensions/wallet/editor/resources/content/WalletViewer.xul
@@ -36,14 +36,12 @@
       // centerWindowOnScreen();
       
     }
-  
   ]]>
-  
   </script>        
         
   <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletViewer.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-
+  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
   <keyset id="dialogKeys"/>
 
   <hbox flex="1">
@@ -57,7 +55,7 @@
 
   <separator/>
 
-  <hbox id="okCancelButtonsRight" />
+  <hbox id="okCancelHelpButtonsRight" />
 
   <script type="application/x-javascript">
     <![CDATA[
diff --git a/extensions/wallet/signonviewer/SignonViewer.js b/extensions/wallet/signonviewer/SignonViewer.js
index e879d48ed7b0..bcc0f59bc596 100644
--- a/extensions/wallet/signonviewer/SignonViewer.js
+++ b/extensions/wallet/signonviewer/SignonViewer.js
@@ -535,3 +535,10 @@ function TrimString(string)
   return string.replace(/(^\s+)|(\s+$)/g, '')
 }
 
+function doHelpButton() {
+  if (isPasswordManager) {
+     openHelp("password_mgr");
+  } else {
+     openHelp("forms_sites");
+  }
+}
diff --git a/extensions/wallet/signonviewer/SignonViewer.xul b/extensions/wallet/signonviewer/SignonViewer.xul
index e700c2e6aeba..5afdd800fe8e 100644
--- a/extensions/wallet/signonviewer/SignonViewer.xul
+++ b/extensions/wallet/signonviewer/SignonViewer.xul
@@ -34,12 +34,15 @@
         alttitle="&windowalttitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="width: 30em!important;"
+        buttons="accept,cancel,help"
         onload="Startup()"
-        ondialogaccept="return onAccept();">
+        ondialogaccept="return onAccept();"
+        ondialoghelp="return doHelpButton();">
 
   <script src="chrome://communicator/content/wallet/SignonViewer.js"/>
   <script src="chrome://global/content/strres.js"/>
   <script src="chrome://communicator/content/wallet/nsWalletTreeUtils.js"/>
+  <script src="chrome://help/content/contextHelp.js"/>
 
   <stringbundle id="signonBundle"
                 src="chrome://communicator/locale/wallet/SignonViewer.properties"/>
diff --git a/extensions/wallet/walletpreview/WalletPreview.js b/extensions/wallet/walletpreview/WalletPreview.js
index 4a4a45999e42..b488ea69fc6e 100644
--- a/extensions/wallet/walletpreview/WalletPreview.js
+++ b/extensions/wallet/walletpreview/WalletPreview.js
@@ -1,3 +1,4 @@
+
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * The contents of this file are subject to the Netscape Public
@@ -164,3 +165,8 @@ function Cancel() {
   walletpreview.SetValue(result, window);
   return true;
 }
+
+function doHelpButton() {
+  openHelp("forms_prefill");
+  return true;
+}
diff --git a/extensions/wallet/walletpreview/WalletPreview.xul b/extensions/wallet/walletpreview/WalletPreview.xul
index 511e545f2c17..bbbc88288461 100644
--- a/extensions/wallet/walletpreview/WalletPreview.xul
+++ b/extensions/wallet/walletpreview/WalletPreview.xul
@@ -31,11 +31,13 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         ondialogaccept="return Save();"
         ondialogcancel="return Cancel();"
+        ondialoghelp="return doHelpButton();"
         orient="vertical" class="dialog" onload="Startup()">
 
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
   <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletPreview.js"/>
   <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <keyset id="dialogKeys"/>
 
@@ -62,5 +64,6 @@
     <spacer flex="1"/>
     <button dlgtype="accept" class="dialog-button"/>
     <button dlgtype="cancel" class="dialog-button"/>
+    <button dlgtype="help" class="dialog-button"/>
   </hbox>
 </dialog>