diff --git a/editor/ui/composer/content/viewsource.js b/editor/ui/composer/content/viewsource.js
index dabb1852e618..1a437915baab 100644
--- a/editor/ui/composer/content/viewsource.js
+++ b/editor/ui/composer/content/viewsource.js
@@ -22,20 +22,21 @@
  */
 
 
-  function StartupViewSource() {
-    // Generate unique name (var appCoreName declared in navigator.js).
-    EdAppCoreName = "ViewSource." + ( new Date() ).getTime().toString();
-    
-    // Create and initialize the browser app core.
-    EdAppCore = new BrowserAppCore();
-    EdAppCore.Init( EdAppCoreName );
-    EdAppCore.setContentWindow(window.frames[0]);
-    EdAppCore.setWebShellWindow(window);
-    EdAppCore.setToolbarWindow(window);
+function StartupViewSource()
+{
+	// Create and initialize the browser instance.
+	createBrowserInstance();
 
-    // Get url whose source to view.
-    var url = document.getElementById("args").getAttribute("value");
+	if ( appCore ) {
+	    appCore.isViewSource = true;
+	    appCore.setContentWindow(window.frames[0]);
+	    appCore.setWebShellWindow(window);
+	    appCore.setToolbarWindow(window);
+	}
 
-    // Load the source (the app core will magically know what to do).
-    EdAppCore.loadUrl(url);
-  }
+	// Get url whose source to view.
+	var url = window.arguments[0];
+
+	// Load the source (the app core will magically know what to do).
+	appCore.loadUrl( url );
+}
diff --git a/editor/ui/composer/content/viewsource.xul b/editor/ui/composer/content/viewsource.xul
index b4c76112628d..041876818e5e 100644
--- a/editor/ui/composer/content/viewsource.xul
+++ b/editor/ui/composer/content/viewsource.xul
@@ -29,11 +29,12 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/viewSource.dtd" >
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onunload="EditorShutdown()"
+        onload="StartupViewSource()"
         title="&mainWindow.title;" align="vertical" width="640" height="480">
   
-  <html:script src="chrome://editor/content/EditorCommands.js"></html:script>
+  <html:script src="chrome://navigator/content/navigator.js"></html:script>
   <html:script src="chrome://editor/content/viewsource.js"></html:script>
+  <html:script src="chrome://editor/content/EditorCommands.js"></html:script>
 
   <broadcaster id="args" value="http://www.mozilla.org/"/>
   <broadcaster id="canPrint"/>
@@ -44,12 +45,7 @@
   <broadcaster id="Editor:OnStopBinding"/>
   <broadcaster id="Editor:Throbber" busy="false"/>
 
-  
-  <!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
-  <broadcaster id="dialog.start" ready="false"/>
-  <observes element="dialog.start" attribute="ready" onchange="StartupViewSource()"/>
-    
-  <menubar>
+   <menubar>
     <menu value="&fileMenu.label;">
 	    <menupopup>
 			  <menuitem value="&browserCmd.label;" oncommand="BrowserNewWindow();"/>