diff --git a/mozilla/extensions/wallet/walletpreview/WalletPreview.js b/mozilla/extensions/wallet/walletpreview/WalletPreview.js
index c9d31a16b99..4a4a45999e4 100644
--- a/mozilla/extensions/wallet/walletpreview/WalletPreview.js
+++ b/mozilla/extensions/wallet/walletpreview/WalletPreview.js
@@ -110,10 +110,6 @@ function Startup() {
 
     }
   }
-
-  /* initialization OK and Cancel buttons */
-
-  doSetOKCancel(Save, Cancel);
 }
 
 function UpdateMenuListEnable(checkBox) {
diff --git a/mozilla/extensions/wallet/walletpreview/WalletPreview.xul b/mozilla/extensions/wallet/walletpreview/WalletPreview.xul
index 8c39b197de0..511e545f2c1 100644
--- a/mozilla/extensions/wallet/walletpreview/WalletPreview.xul
+++ b/mozilla/extensions/wallet/walletpreview/WalletPreview.xul
@@ -25,10 +25,12 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/wallet/WalletPreview.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/wallet/WalletPreview.dtd" >
 
-<window title="&windowtitle.label;"
+<dialog title="&windowtitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        ondialogaccept="return Save();"
+        ondialogcancel="return Cancel();"
         orient="vertical" class="dialog" onload="Startup()">
 
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
@@ -41,7 +43,7 @@
   
   <spacer/>
   
-  <hbox class="inset" flex="1">
+  <hbox class="inset" flex="1" style="overflow: auto">
     <grid class="indent" flex="1">
       <columns flex="1">
         <column flex="1" crop="right"/>
@@ -54,11 +56,11 @@
   <hbox>
     <checkbox id="checkbox" label="&bypass.label;"/>
   </hbox>
-  
+
   <hbox>
     <button label="&viewdata.label;" oncommand="formShow();"/>
     <spacer flex="1"/>
-    <hbox id="okCancelButtons"/>
+    <button dlgtype="accept" class="dialog-button"/>
+    <button dlgtype="cancel" class="dialog-button"/>
   </hbox>
-
-</window>
+</dialog>