diff --git a/mozilla/browser/components/preferences/feeds.js b/mozilla/browser/components/preferences/feeds.js
index 747c1caa90a..5ec2df6e365 100644
--- a/mozilla/browser/components/preferences/feeds.js
+++ b/mozilla/browser/components/preferences/feeds.js
@@ -181,6 +181,8 @@ var gFeedsPane = {
    */
   _initFeedReaders: function() {
     this.updateSelectedApplicationInfo();
+
+    var readersList = this.element("readers");
 #ifdef XP_WIN
     // On Windows, list the system default feed reader if it is
     // not the last-selected application already
@@ -192,10 +194,12 @@ var gFeedsPane = {
         var selectedAppFile = this.element("selectedAppFilefield").file;
         if (!selectedAppFile || defaultSystemReaderFilefield.file.path !=
             selectedAppFile.path) {
-          var defaultReaderItem = this.element("defaultSystemReaderListitem");
+          var defaultReaderItem = document.createElementNS(kXULNS, "listitem");
+          defaultReaderItem.id = "defaultSystemReaderListitem";
+          defaultReaderItem.className = "listitem-iconic";
           defaultReaderItem.setAttribute("label", defaultSystemReaderFilefield.label);
           defaultReaderItem.setAttribute("image", defaultSystemReaderFilefield.image);
-          defaultReaderItem.hidden = false;
+          readersList.appendChild(defaultReaderItem);
         }
       }
     }
@@ -213,7 +217,6 @@ var gFeedsPane = {
     var ios = 
         Cc["@mozilla.org/network/io-service;1"].
         getService(Ci.nsIIOService);
-    var readersList = this.element("readers");
     for (var i = 0; i < handlers.length; ++i) {
       var row = document.createElementNS(kXULNS, "listitem");
       row.className = "listitem-iconic";
diff --git a/mozilla/browser/components/preferences/feeds.xul b/mozilla/browser/components/preferences/feeds.xul
index 7bb477c4f6b..127d5b9ddd2 100644
--- a/mozilla/browser/components/preferences/feeds.xul
+++ b/mozilla/browser/components/preferences/feeds.xul
@@ -104,18 +104,13 @@
                     image="chrome://browser/skin/page-livemarks.png"/>
           <listitem id="selectedApplicationListitem" allowevents="true">
             <listcell id="selectedApplicationCell" class="listcell-iconic"/>
-            <listcell>
+            <listcell id="chooseClientAppCell">
               <button id="chooseClientApp"
                       label="&chooseApplication.label;"
                       accesskey="&chooseApplication.accesskey;"
                       oncommand="gFeedsPane.chooseClientApp();"/>
             </listcell>
           </listitem>
-#ifdef XP_WIN
-          <listitem id="defaultSystemReaderListitem"
-                    class="listitem-iconic"
-                    hidden="true"/>
-#endif
         </listbox>
       </hbox>
     </radiogroup>
diff --git a/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css b/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
index 09af8d1b3cb..eab252d6b55 100644
--- a/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
+++ b/mozilla/browser/themes/pinstripe/browser/preferences/preferences.css
@@ -262,3 +262,9 @@ caption {
 }
 
 
+/**
+ * Feeds pane
+ */
+#chooseClientAppCell {
+  -moz-padding-end: 12px;
+}
diff --git a/mozilla/browser/themes/winstripe/browser/preferences/preferences.css b/mozilla/browser/themes/winstripe/browser/preferences/preferences.css
index 965b2ca5c23..0a3cbe32ead 100644
--- a/mozilla/browser/themes/winstripe/browser/preferences/preferences.css
+++ b/mozilla/browser/themes/winstripe/browser/preferences/preferences.css
@@ -252,3 +252,8 @@ filefield[disabled="true"] .fileFieldIcon {
   -moz-margin-start: 6px !important; 
   font-weight: bold;
 }
+
+/* Feeds pane */
+#chooseClientAppCell {
+  -moz-padding-end: 12px;
+}