diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css
index da7f1655b0fe..0557288a2e1e 100644
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -280,14 +280,12 @@ menupopup::part(drop-indicator) {
 
 /* Find bar */
 
-.browserContainer > findbar > #findbar-close-container,
 .browserContainer > findbar {
   background-color: var(--toolbar-non-lwt-bgcolor);
   color: var(--toolbar-non-lwt-textcolor);
   text-shadow: none;
 }
 
-:root:not([lwtheme-image]) .browserContainer > findbar:-moz-lwtheme > #findbar-close-container,
 :root:not([lwtheme-image]) .browserContainer > findbar:-moz-lwtheme {
   background-color: var(--lwt-accent-color);
   background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
@@ -295,7 +293,6 @@ menupopup::part(drop-indicator) {
   color: var(--toolbar-color);
 }
 
-:root:not([lwtheme-image]) .browserContainer > findbar:-moz-lwtheme:-moz-window-inactive > #findbar-close-container,
 :root:not([lwtheme-image]) .browserContainer > findbar:-moz-lwtheme:-moz-window-inactive {
   background-color: var(--lwt-accent-color-inactive, var(--lwt-accent-color));
 }
diff --git a/toolkit/content/widgets/findbar.js b/toolkit/content/widgets/findbar.js
index 370cf26a2260..542ce37c8efc 100644
--- a/toolkit/content/widgets/findbar.js
+++ b/toolkit/content/widgets/findbar.js
@@ -65,10 +65,8 @@
         <image anonid="find-status-icon" class="find-status-icon" />
         <description anonid="find-status" control="findbar-textbox" class="findbar-label findbar-find-status" />
       </hbox>
-      <div id="findbar-close-container">
-        <toolbarbutton anonid="find-closebutton" class="findbar-closebutton tabbable close-icon"
-            data-l10n-id="findbar-find-button-close" oncommand="close();" />
-      </div>
+      <toolbarbutton anonid="find-closebutton" class="findbar-closebutton tabbable close-icon"
+        data-l10n-id="findbar-find-button-close" oncommand="close();"/>
       `;
     }
 
diff --git a/toolkit/themes/shared/findbar.css b/toolkit/themes/shared/findbar.css
index aa4c82ac08ca..a668fc30dd67 100644
--- a/toolkit/themes/shared/findbar.css
+++ b/toolkit/themes/shared/findbar.css
@@ -31,7 +31,7 @@ findbar[noanim] {
 .findbar-container {
   margin-inline-start: 8px;
   height: 28px;
-  min-width: calc(100vw - 48px);
+  overflow: hidden; /* Ensures the close button stays visible. */
 }
 
 /* Remove start margin when close button is on the left side (on macOS) */
@@ -189,9 +189,6 @@ html|input.findbar-textbox::placeholder,
 }
 
 /* Close button */
-#findbar-close-container {
-  position: relative;
-}
 
 /* Increase specificity to override close-icon.css */
 .close-icon.findbar-closebutton {