diff --git a/mozilla/extensions/wallet/walletpreview/WalletPreview.js b/mozilla/extensions/wallet/walletpreview/WalletPreview.js
index 02939cb0415..35a7d12a734 100644
--- a/mozilla/extensions/wallet/walletpreview/WalletPreview.js
+++ b/mozilla/extensions/wallet/walletpreview/WalletPreview.js
@@ -47,19 +47,45 @@
       for (i=1; !(i>=prefillList.length-2); i+=3) {
         if(prefillList[i] != 0) {
           count = prefillList[i];
+
+/* the right way to do it
+ *        top.frames[list_frame].document.write(
+ *              "<tr>" +
+ *                "<td>" + prefillList[i+1] + ":  </td>" +
+ *                "<td>" +
+ *                  "<select>" 
+ *        )
+ *        count--;
+ *      }
+ *      top.frames[list_frame].document.write(
+ *                    "<option VALUE='"+prefillList[i+1]+"'>" +
+ *                      prefillList[i+2] +
+ *                    "</option>" 
+ *      )
+ *
+ * but because of bug 18479 we have to hack things by putting the
+ * <select> and the first <option> into a single write statement as follows:
+ */
+
           top.frames[list_frame].document.write(
                 "<tr>" +
                   "<td>" + prefillList[i+1] + ":  </td>" +
                   "<td>" +
-                    "<select>" 
-          )
-          count--;
-        }
-        top.frames[list_frame].document.write(
+                    "<select>" +
                       "<option VALUE='"+prefillList[i+1]+"'>" +
                         prefillList[i+2] +
                       "</option>" 
-        )
+          )
+          count--;
+        } else {
+          top.frames[list_frame].document.write(
+                      "<option VALUE='"+prefillList[i+1]+"'>" +
+                        prefillList[i+2] +
+                      "</option>" 
+          )
+/* end of hack */
+
+        }
         if(count == 0) {
           top.frames[list_frame].document.write(
                       "<option VALUE='"+prefillList[i+1]+"'>&lt;do not prefill&gt;</option>" +