diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js
index 450438c5b4e8..8e33bee413c1 100644
--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -492,12 +492,6 @@ class Onboarding {
         this.gotoPage(tourId);
         this._removeTourFromNotificationQueue(tourId);
         break;
-      // These tours are tagged completed instantly upon showing.
-      case "onboarding-tour-default-browser":
-      case "onboarding-tour-sync":
-      case "onboarding-tour-performance":
-        this.setToursCompleted([ evt.target.id ]);
-        break;
     }
     let classList = evt.target.classList;
     if (classList.contains("onboarding-tour-item")) {
@@ -557,6 +551,15 @@ class Onboarding {
         li.classList.remove("onboarding-active");
       }
     }
+
+    switch (tourId) {
+      // These tours should tagged completed instantly upon showing.
+      case "onboarding-tour-default-browser":
+      case "onboarding-tour-sync":
+      case "onboarding-tour-performance":
+        this.setToursCompleted([tourId]);
+        break;
+    }
   }
 
   isTourCompleted(tourId) {