diff --git a/mozilla/webshell/tests/viewer/main.cpp b/mozilla/webshell/tests/viewer/main.cpp
index 5f2b5cfc80c..736ef72081c 100644
--- a/mozilla/webshell/tests/viewer/main.cpp
+++ b/mozilla/webshell/tests/viewer/main.cpp
@@ -24,7 +24,7 @@
 #define FILE_BASE_URL "file:////home/kmcclusk/mozilla/dist/Linux2.0.31_x86_DBG.OBJ/bin/res/samples"
 
 class nsMotifViewer : public nsViewer {
-    virtual void AddMenu(nsIWidget* aMainWindow);
+    virtual void AddMenu(nsIWidget* aMainWindow, PRBool aForPrintPreview);
     //virtual char* GetBaseURL();
 };
 
@@ -63,7 +63,7 @@ void MenuProc(PRUint32 aId)
 }
 
 //--------------------------------------------------------
-void nsMotifViewer::AddMenu(nsIWidget* aMainWindow)
+void nsMotifViewer::AddMenu(nsIWidget* aMainWindow, PRBool aForPrintPreview)
 {
   CreateViewerMenus(XtParent((Widget)aMainWindow->GetNativeData(NS_NATIVE_WIDGET)), MenuProc);
 }
diff --git a/mozilla/webshell/tests/viewer/nsViewer.cpp b/mozilla/webshell/tests/viewer/nsViewer.cpp
index f9ac2c91cba..68c06e15eda 100644
--- a/mozilla/webshell/tests/viewer/nsViewer.cpp
+++ b/mozilla/webshell/tests/viewer/nsViewer.cpp
@@ -899,6 +899,7 @@ nsresult nsViewer::ShowPrintPreview(nsIWebWidget* web, PRIntn aColumns)
       nsRect rr(0, 0, bounds.width, bounds.height);
 
       rv = NS_NewWebWidget(&wd->ww);
+      AddMenu(wd->windowWidget, PR_TRUE);
       rv = wd->ww->Init(wd->windowWidget->GetNativeData(NS_NATIVE_WIDGET), rr, doc, cx);
       wd->ww->Show();
       wd->observer = NewObserver(wd->ww);
@@ -1139,7 +1140,7 @@ nsDocLoader* nsViewer::SetupViewer(nsIWidget **aMainWindow, int argc, char **arg
   gMainWindowData = wd;
 
     // Attach a menu to the top level window
-  AddMenu(wd->windowWidget);
+  AddMenu(wd->windowWidget, PR_FALSE);
 
     // Now embed the web widget in it
   nsresult rv = NS_NewWebWidget(&wd->ww);
@@ -1211,7 +1212,7 @@ static char defaultURL[MAXPATHLEN];
   return(defaultURL);
 }
 
-void nsViewer::AddMenu(nsIWidget* aMainWindow)
+void nsViewer::AddMenu(nsIWidget* aMainWindow, PRBool aForPrintPreview)
 {
   printf("Menu not implemented\n");
 }
diff --git a/mozilla/webshell/tests/viewer/nsViewer.h b/mozilla/webshell/tests/viewer/nsViewer.h
index be9311ca665..d9bd346e04a 100644
--- a/mozilla/webshell/tests/viewer/nsViewer.h
+++ b/mozilla/webshell/tests/viewer/nsViewer.h
@@ -136,7 +136,7 @@ class nsViewer : public nsDispatchListener {
   public:
     virtual char* GetBaseURL();
     virtual char* GetDefaultStartURL();
-    virtual void AddMenu(nsIWidget* aMainWindow);
+    virtual void AddMenu(nsIWidget* aMainWindow, PRBool aForPrintPreview);
     virtual void ShowConsole(WindowData* aWindata);
     virtual void CloseConsole();
     virtual void DoDebugRobot(WindowData* aWindata);
diff --git a/mozilla/webshell/tests/viewer/winmain.cpp b/mozilla/webshell/tests/viewer/winmain.cpp
index e011afb142b..f7f5fd40d28 100644
--- a/mozilla/webshell/tests/viewer/winmain.cpp
+++ b/mozilla/webshell/tests/viewer/winmain.cpp
@@ -53,7 +53,7 @@ extern int  NET_PollSockets();
 class nsWin32Viewer : public nsViewer {
     // From nsViewer
   public:
-    virtual void AddMenu(nsIWidget* aMainWindow);
+    virtual void AddMenu(nsIWidget* aMainWindow, PRBool aForPrintPreview);
     virtual void ShowConsole(WindowData* aWindata);
     virtual void DoDebugRobot(WindowData* aWindata);
     virtual void CopySelection(WindowData* aWindata);
@@ -75,6 +75,7 @@ static HANDLE gInstance, gPrevInstance;
 JSConsole *gConsole = NULL;
 
 static char* class1Name = "Viewer";
+static char* class2Name = "PrintPreview";
 
 void DestroyConsole()
 {
@@ -176,9 +177,10 @@ void AddViewerMenu(HINSTANCE hInstance, nsIWidget* aWidget, LPCTSTR lpMenuName)
   ::SetMenu(hwnd, menu);
 }
 
-void nsWin32Viewer::AddMenu(nsIWidget* aMainWindow)
+void nsWin32Viewer::AddMenu(nsIWidget* aMainWindow, PRBool aForPrintPreview)
 {
-   AddViewerMenu(gInstance, aMainWindow, class1Name);
+   AddViewerMenu(gInstance, aMainWindow,
+                 aForPrintPreview ? class2Name : class1Name);
 }
 
 //-----------------------------------------------------------------