diff --git a/mozilla/browser/themes/winstripe/browser/bookmarks/addBookmark.css b/mozilla/browser/themes/winstripe/browser/bookmarks/addBookmark.css
index 7e731e04fa1..5fd0ec5945c 100644
--- a/mozilla/browser/themes/winstripe/browser/bookmarks/addBookmark.css
+++ b/mozilla/browser/themes/winstripe/browser/bookmarks/addBookmark.css
@@ -13,51 +13,34 @@
   -moz-image-region: rect(0px, 32px, 16px, 16px) !important;
 }
 
-/* Hide the drop marker if no microsummaries are available. */
-menulist#name[droppable="false"] > .menulist-dropmarker {
-  display: none;
-}
-
-/*
- * Editable menulists look almost like regular textboxes, but not quite,
- * which makes it look like something is off a bit when you place a menulist
- * next to a textbox, f.e. the microsummary picker above the Location field
- * and other fields in the Bookmarks Properties dialog box.
- *
- * Of course, there aren't any text fields here in the Add Bookmark dialog box,
- * but for consistency with the Bookmark Properties dialog box, we correct
- * the appearance of the picker here as well.
- * 
+/* Make the microsummary picker look like a regular textbox instead of 
+ * an editable menulist when no microsummaries are available.
  */
 
-menulist#name > .menulist-editable-box {
-  /* Normal editable menulists set this to "menulist-textfield". */
-  -moz-appearance: none;
-}
-
-menulist#name {
+menulist#name[droppable="false"] {
   /* These rules come from the textbox element in textbox.css. */
 
   /* Normal editable menulists set this to "none". */
   -moz-appearance: textfield;
-
-  /* Follow the rule for normal editable menulists (cursor: auto;) instead of
-   * textboxes (cursor: text;) so the cursor is a pointer over the dropmarker.
-   */
-  /* cursor: text; */
-
-  /* Follow the rule for normal editable menulists (margin: 2px 2px;) instead of
-   * textboxes (margin: 2px 4px;) so the list lines up with the "Create in:"
-   * drop-down menu below it.
-   */
-  /* margin: 2px 4px; */
+  cursor: text;
 
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
   -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  padding: 2px 2px 3px 4px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
+
+menulist#name[droppable="false"] > .menulist-editable-box {
+  /* Normal editable menulists set this to "menulist-textfield". */
+  -moz-appearance: none;
+  padding: 2px 2px 3px 4px;
+}
+
+/* Hide the drop marker and the popup when no microsummaries are available. */
+menulist#name[droppable="false"] > .menulist-dropmarker,
+menulist#name[droppable="false"] > menupopup {
+  display: none;
+}
diff --git a/mozilla/browser/themes/winstripe/browser/bookmarks/bookmarksProperties.css b/mozilla/browser/themes/winstripe/browser/bookmarks/bookmarksProperties.css
index cc20a427c00..64d81e6872f 100644
--- a/mozilla/browser/themes/winstripe/browser/bookmarks/bookmarksProperties.css
+++ b/mozilla/browser/themes/winstripe/browser/bookmarks/bookmarksProperties.css
@@ -19,6 +19,7 @@
  *
  * Contributor(s):
  *   Myk Melez <myk@mozilla.org>
+ *   Simon Bünzli <zeniko@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -34,47 +35,34 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/* Hide the drop marker if no microsummaries are available. */
-menulist#name[droppable="false"] > .menulist-dropmarker {
-  display: none;
-}
-
-/*
- * Editable menulists look almost like regular textboxes, but not quite,
- * which makes it look like something is off a bit when you place a menulist
- * next to a textbox, f.e. the microsummary picker above the Location field
- * and other fields in the Bookmarks Properties dialog box.
- *
- * These styles correct the appearance of the picker in that dialog box,
- * making it look just like the textboxes below it.
- * 
+/* Make the microsummary picker look like a regular textbox instead of 
+ * an editable menulist when no microsummaries are available.
  */
 
-menulist#name > .menulist-editable-box {
-  /* Normal editable menulists set this to "menulist-textfield". */
-  -moz-appearance: none;
-}
-
-menulist#name {
+menulist#name[droppable="false"] {
   /* These rules come from the textbox element in textbox.css. */
 
   /* Normal editable menulists set this to "none". */
   -moz-appearance: textfield;
-
-  /* Follow the rule for normal editable menulists (cursor: auto;) instead of
-   * textboxes (cursor: text;) so the cursor is a pointer over the dropmarker.
-   */
-  /* cursor: text; */
-
-  /* Normal editable menulists set this to "2px 2px". */
-  margin: 2px 4px;
+  cursor: text;
 
   border: 2px solid;
   -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
   -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
   -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
-  padding: 2px 2px 3px 4px;
   background-color: -moz-Field;
   color: -moz-FieldText;
 }
+
+menulist#name[droppable="false"] > .menulist-editable-box {
+  /* Normal editable menulists set this to "menulist-textfield". */
+  -moz-appearance: none;
+  padding: 2px 2px 3px 4px;
+}
+
+/* Hide the drop marker and the popup when no microsummaries are available. */
+menulist#name[droppable="false"] > .menulist-dropmarker,
+menulist#name[droppable="false"] > menupopup {
+  display: none;
+}