diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index dc4487adb900..ab52152b73af 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -188,7 +188,7 @@
         <menuitem id="menu_closeWindow" hidden="true" command="cmd_closeWindow" key="key_closeWindow" label="&closeWindow.label;"/>
         <menuseparator id="menu_closeSeparator" hidden="true"/>
         <menuitem label="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;" key="key_savePage" command="Browser:SavePage"/>
-        <menuitem id="savepage" label="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" oncommand="savePage(gFocusedURL, gFocusedDocument);" hidden="true"/>
+        <menuitem id="savepage" label="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" oncommand="saveDocument(gFocusedDocument);" hidden="true"/>
         <menuseparator/>
         <menuitem label="&editPageCmd.label;" accesskey="&editPageCmd.accesskey;" key="key_editPage" command="Browser:EditPage" />
         <menuseparator/>
diff --git a/suite/browser/viewSource.xul b/suite/browser/viewSource.xul
index 0b16fab2f8bd..4f1fde9c2d9f 100644
--- a/suite/browser/viewSource.xul
+++ b/suite/browser/viewSource.xul
@@ -66,6 +66,7 @@
     <commandset id="viewSourceMenuItems">
       <command id="cmdWrapLongLines" oncommand="wrapLongLines()"/>
       <command id="cmd_close" oncommand="ViewSourceClose()"/>
+      <command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
     </commandset>
   </commandset>
     
@@ -78,7 +79,7 @@
  <!-- File Menu -->
     <key id="key_newNavigator"/>
     <key id="key_newBlankPage"/>
-    <key id="key_savePage"       key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
+    <key id="key_savePage"       key="&savePageCmd.commandkey;" command="cmd_savePage" modifiers="accel"/>
     <key id="key_editPage"       key="&editPageCmd.commandkey;" command="Browser:EditPage" modifiers="accel"/>
     <key id="printKb"            key="&printCmd.commandkey;" command="Browser:Print"  modifiers="accel"/>
     <key id="key_close"/>
@@ -123,8 +124,8 @@
         <menuseparator/>
 
         <menuitem id="menu_close"/>
-        <menuitem label="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;" key="key_savePage" command="Browser:SavePage"/>
-        <menuitem id="savepage" label="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" oncommand="savePage(gFocusedURL);" hidden="true"/>
+        <menuitem label="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;" key="key_savePage" command="cmd_savePage"/>
+        <menuitem id="savepage" label="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" oncommand="ViewSourceSavePage();" hidden="true"/>
         <menuseparator/>
         <menuitem label="&editPageCmd.label;" accesskey="&editPageCmd.accesskey;" key="key_editPage" oncommand="ViewSourceEditPage();"/>
 
diff --git a/suite/browser/viewsource.js b/suite/browser/viewsource.js
index ac9a371cad66..576866742c95 100644
--- a/suite/browser/viewsource.js
+++ b/suite/browser/viewsource.js
@@ -105,6 +105,15 @@ function ViewSourceEditPage()
   editPage(url,window, false);
 }
 
+// Strips the |view-source:| for saveURL()
+function ViewSourceSavePage()
+{
+  var url = window._content.document.location.href;
+  url = url.substring(12,url.length);
+
+  saveURL(url, null, "SaveLinkTitle");
+}
+
 //function to toggle long-line wrapping and set the view_source.wrap_long_lines 
 //pref to persist the last state
 function wrapLongLines()