--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -336,23 +336,26 @@
             </menulist>
           </hbox>
           <hbox id="keepRow"
                 class="indent"
                 align="center">
             <label id="keepUntil"
                    control="keepCookiesUntil"
                    accesskey="&keepUntil2.accesskey;">&keepUntil2.label;</label>
-            <menulist id="keepCookiesUntil"
-                      preference="network.cookie.lifetimePolicy">
-              <menupopup>
-                <menuitem label="&expire.label;" value="0"/>
-                <menuitem label="&close.label;" value="2"/>
-              </menupopup>
-            </menulist>
+            <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
+            <hbox>
+              <menulist id="keepCookiesUntil"
+                        preference="network.cookie.lifetimePolicy">
+                <menupopup>
+                  <menuitem label="&expire.label;" value="0"/>
+                  <menuitem label="&close.label;" value="2"/>
+                </menupopup>
+              </menulist>
+            </hbox>
             <spacer flex="1"/>
             <button id="showCookiesButton"
                     class="accessory-button"
                     label="&showCookies.label;" accesskey="&showCookies.accesskey;"
                     preference="pref.privacy.disable_button.view_cookies"/>
           </hbox>
           <hbox id="clearDataBox"
                 align="center">