diff --git a/mozilla/editor/ui/composer/content/EditorAppShell.xul b/mozilla/editor/ui/composer/content/EditorAppShell.xul
index c675be3f12f..a07f1fa5c4b 100644
--- a/mozilla/editor/ui/composer/content/EditorAppShell.xul
+++ b/mozilla/editor/ui/composer/content/EditorAppShell.xul
@@ -36,6 +36,7 @@
 
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="EditorOnLoad()"
         onunload="EditorShutdown()" title="&editorWindow.title;" align="vertical"
         width="640" height="480">
 
diff --git a/mozilla/editor/ui/composer/content/EditorCommands.js b/mozilla/editor/ui/composer/content/EditorCommands.js
index 1e4d6661a81..df16915e53b 100644
--- a/mozilla/editor/ui/composer/content/EditorCommands.js
+++ b/mozilla/editor/ui/composer/content/EditorCommands.js
@@ -49,6 +49,20 @@ var gStyleTags = {
     "underline"  : "u"
   };
   
+function EditorOnLoad() {
+    // See if argument was passed.
+    if ( window.arguments && window.arguments[0] ) {
+        // Opened via window.openDialog with URL as argument.    
+        // Put argument where EditorStartup expects it.
+        document.getElementById( "args" ).setAttribute( "value", window.arguments[0] );
+        // Continue with normal startup.
+        EditorStartup( 'html' );
+        return;
+    } else {
+        // No problem, proceed the old-fashioned way.
+        return;
+    }
+}
   
 function EditorStartup(editorType)
 {