diff --git a/mozilla/extensions/help/resources/content/contextHelp.js b/mozilla/extensions/help/resources/content/contextHelp.js
index 9a353b0572c..e6de9b9ca80 100755
--- a/mozilla/extensions/help/resources/content/contextHelp.js
+++ b/mozilla/extensions/help/resources/content/contextHelp.js
@@ -30,8 +30,14 @@ function openHelp(topic) {
     topWindow.focus();
     topWindow.displayTopic(topic);
   } else {
-      var encodedURI = encodeURIComponent(helpFileURI + "?" + ((topic)?topic:""));  
-      window.open(MOZ_HELP_URI + "?" + encodedURI, "_blank", "chrome,menubar,toolbar,dialog=no,resizable,scrollbars,alwaysRaised");
+    var params = Components.classes["@mozilla.org/embedcomp/dialogparam;1"]
+                           .createInstance(Components.interfaces.nsIDialogParamBlock);
+    params.SetNumberStrings(2);
+    params.SetString(0, helpFileURI);
+    params.SetString(1, topic);
+    var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+                       .getService(Components.interfaces.nsIWindowWatcher);
+    ww.openWindow(null, MOZ_HELP_URI, "_blank", "chrome,all,dialog=no", params);
   }
 }
 
diff --git a/mozilla/extensions/help/resources/content/help.js b/mozilla/extensions/help/resources/content/help.js
index 196ed617812..e1c067e2955 100644
--- a/mozilla/extensions/help/resources/content/help.js
+++ b/mozilla/extensions/help/resources/content/help.js
@@ -96,14 +96,13 @@ function init() {
   helpGlossaryPanel = document.getElementById("help-glossary-tree");
   helpBrowser = document.getElementById("help-content");
 
-  var URI = normalizeURI(decodeURIComponent(window.location.search));
-  helpFileURI = URI.helpFileURI;
-  var helpTopic = URI.topic;
+  var params = window.arguments[0].QueryInterface(Components.interfaces.nsIDialogParamBlock);
+  helpFileURI = params.GetString(0);
   helpBaseURI = helpFileURI.substring(0, helpFileURI.lastIndexOf("/")+1); // trailing "/" included.
 
   loadHelpRDF();
 
-  displayTopic(helpTopic);  
+  displayTopic(params.GetString(1));
 
   // move to right end of screen
   var width = document.documentElement.getAttribute("width");
@@ -121,38 +120,6 @@ function init() {
   webProgress.addProgressListener(window.XULBrowserWindow, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
 }
 
-function normalizeURI(uri) {
-  // uri in format [uri of help rdf file][?initial topic]
-  // if the whole uri or help file uri is omitted then the default help is assumed.
-  // unpack uri
-  var URI = {};
-  URI.helpFileURI = defaultHelpFile;
-  URI.topic = null;
-  // Case: No help uri at all.
-  if (uri) {
-    // remove leading ?
-    if (uri.substr(0,1) == "?") 
-      uri = uri.substr(1);
-    var i = uri.indexOf("?");
-    // Case: Full uri with topic.
-    if ( i != -1) {
-        URI.helpFileURI = uri.substr(0,i);
-        URI.topic = uri.substr(i+1);
-    }
-    else {
-      // Case: uri with no topic.
-      if (uri.substr(0,7) == "chrome:") 
-        URI.helpFileURI = uri;
-      else {
-        // Case: uri with topic only.
-        URI.topic = uri;
-      }  
-    }
-  }  
-  URI.uri = URI.helpFileURI + ((URI.topic)? "?" + URI.topic : "");
-  return URI;
-}
-
 function loadHelpRDF() {
   if (!helpFileDS) {
     try {