diff --git a/waterfox/browser/app/profile/00-waterfox.js b/waterfox/browser/app/profile/00-waterfox.js
index 1632778a5f62a..e893755de77ef 100644
--- a/waterfox/browser/app/profile/00-waterfox.js
+++ b/waterfox/browser/app/profile/00-waterfox.js
@@ -94,6 +94,7 @@ pref("browser.closeShortcut.disabled", false);
 
 // Extensibles prefs
 pref("browser.tabs.duplicateTab", true);
+pref("browser.tabs.closeButtons", false);
 pref("browser.tabs.copyurl", true);
 pref("browser.tabs.copyallurls", false);
 pref("browser.tabs.copyurl.activetab", false);
diff --git a/waterfox/browser/components/WaterfoxGlue.sys.mjs b/waterfox/browser/components/WaterfoxGlue.sys.mjs
index 0faffcce0b356..e5b151468f9ca 100644
--- a/waterfox/browser/components/WaterfoxGlue.sys.mjs
+++ b/waterfox/browser/components/WaterfoxGlue.sys.mjs
@@ -177,6 +177,15 @@ export const WaterfoxGlue = {
         lazy.BrowserUtils.registerOrUnregisterSheet(uri, !isEnabled);
       }
     );
+    this.styleSheetChanges = lazy.PrefUtils.addObserver(
+      "browser.tabs.closeButtons",
+      () => {
+        // Pref being true actually means we need to unload the sheet, so invert.
+        const uri = "chrome://browser/skin/waterfox/general.css";
+        lazy.BrowserUtils.unregisterStylesheet(uri);
+        lazy.BrowserUtils.registerStylesheet(uri);
+      }
+    )
   },
 
   async getChromeManifest(manifest) {
diff --git a/waterfox/browser/themes/waterfox/general.css b/waterfox/browser/themes/waterfox/general.css
index b48b0a2e60611..0598f539dff71 100644
--- a/waterfox/browser/themes/waterfox/general.css
+++ b/waterfox/browser/themes/waterfox/general.css
@@ -180,4 +180,10 @@
 /* Prevent any horizontal scrolling on about:preferences */
 #preferences-body .main-content {
   overflow-x: hidden !important;
+}
+
+@supports -moz-bool-pref("browser.tabs.closeButtons") {
+  .tab-close-button {
+    display: none !important
+  }
 }
\ No newline at end of file