diff --git a/mail/components/about-support/content/aboutSupport.js b/mail/components/about-support/content/aboutSupport.js
index 50bec32ecd..6752735058 100644
--- a/mail/components/about-support/content/aboutSupport.js
+++ b/mail/components/about-support/content/aboutSupport.js
@@ -1589,9 +1589,12 @@ function safeModeRestart() {
 
 // Added for TB.
 function onShowPrivateDataChange() {
-  document.getElementById(
-    "about-support-private"
-  ).disabled = document.getElementById("check-show-private-data").checked;
+  document
+    .getElementById("contents")
+    .classList.toggle(
+      "show-private-data",
+      document.getElementById("check-show-private-data").checked
+    );
 }
 
 /**
diff --git a/mail/components/about-support/content/aboutSupport.xhtml b/mail/components/about-support/content/aboutSupport.xhtml
index 1a297e574c..08a14f13f5 100644
--- a/mail/components/about-support/content/aboutSupport.xhtml
+++ b/mail/components/about-support/content/aboutSupport.xhtml
@@ -23,9 +23,6 @@
 <!-- Added for TB -->
     <link rel="stylesheet" href="chrome://messenger/skin/aboutSupport.css"
           type="text/css"/>
-    <!-- Private data is hidden by default. -->
-    <link rel="stylesheet" href="chrome://messenger/content/about-support/hide-private.css"
-          type="text/css" id="about-support-private"/>
 <!-- End of TB addition -->
     <script src="chrome://messenger/content/about-support/aboutSupport.js"/>
     <link rel="localization" href="branding/brand.ftl"/>
diff --git a/mail/components/about-support/content/hide-private.css b/mail/components/about-support/content/hide-private.css
deleted file mode 100644
index 2eda49f6ee..0000000000
--- a/mail/components/about-support/content/hide-private.css
+++ /dev/null
@@ -1,11 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-.data-private {
-  display: none;
-}
-
-.data-public {
-  display: inline;
-}
diff --git a/mail/components/about-support/jar.mn b/mail/components/about-support/jar.mn
index 3d0b80c1d2..3041fbceb6 100644
--- a/mail/components/about-support/jar.mn
+++ b/mail/components/about-support/jar.mn
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 messenger.jar:
-    content/messenger/about-support/hide-private.css           (content/hide-private.css)
     content/messenger/about-support/accounts.js                (content/accounts.js)
     content/messenger/about-support/export.js                  (content/export.js)
 *   content/messenger/about-support/aboutSupport.xhtml         (content/aboutSupport.xhtml)
diff --git a/mail/themes/shared/mail/aboutSupport.css b/mail/themes/shared/mail/aboutSupport.css
index fdef6fb694..9f84df2513 100644
--- a/mail/themes/shared/mail/aboutSupport.css
+++ b/mail/themes/shared/mail/aboutSupport.css
@@ -2,7 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-.data-public {
+#contents.show-private-data .data-public {
+  display: none;
+}
+
+#contents:not(.show-private-data) .data-private {
   display: none;
 }