--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -227,24 +227,21 @@ class Onboarding {
   }
 
   toggleOverlay() {
     if (this._tourItems.length == 0) {
       // Lazy loading until first toggle.
       this._loadTours(onboardingTours);
     }
 
-    this._overlay.classList.toggle("opened");
+    this._overlay.classList.toggle("onboarding-opened");
     let hiddenCheckbox = this._window.document.getElementById("onboarding-tour-hidden-checkbox");
     if (hiddenCheckbox.checked) {
       this.hide();
-      return;
     }
-
-    this._overlay.classList.toggle("onboarding-opened");
   }
 
   gotoPage(tourId) {
     let targetPageId = `${tourId}-page`;
     for (let page of this._tourPages) {
       page.style.display = page.id != targetPageId ? "none" : "";
     }
     for (let li of this._tourItems) {

--- a/browser/extensions/onboarding/test/browser/head.js
+++ b/browser/extensions/onboarding/test/browser/head.js
@@ -26,17 +26,17 @@ function promiseOnboardingOverlayLoaded(
   );
 }
 
 function promiseOnboardingOverlayOpened(browser) {
   let condition = () => {
     return ContentTask.spawn(browser, {}, function() {
       return new Promise(resolve => {
         let overlay = content.document.querySelector("#onboarding-overlay");
-        if (overlay.classList.contains("opened")) {
+        if (overlay.classList.contains("onboarding-opened")) {
           resolve(true);
           return;
         }
         resolve(false);
       });
     })
   };
   return BrowserTestUtils.waitForCondition(