diff --git a/app/metrics.yaml b/app/metrics.yaml
index 29e763834..3cf650829 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -61,7 +61,6 @@ events:
           * default.suggestion
           * shortcut.action
           * shortcut.suggestion
-
     bugs:
     - 959
     data_reviews:
@@ -136,6 +135,24 @@ events:
     notification_emails:
     - fenix-core@mozilla.com
     expires: "2020-03-01"
+  preference_toggled:
+    type: event
+    description: >
+      A user toggled a preference switch in settings
+    extra_keys:
+      preference_key:
+        description: "The preference key for the switch preference the user toggled. We currently track: leakcanary,
+          make_default_browser, show_search_suggestions, show_visited_sites_bookmarks, remote_debugging, telemetry,
+          tracking_protection"
+      enabled:
+        description: "Whether or not the preference is *now* enabled"
+    bugs:
+    - 975
+    data_reviews:
+    - https://github.com/mozilla-mobile/fenix/pull/1896
+    notification_emails:
+    - fenix-core@mozilla.com
+    expires: "2020-03-01"
 
 crash_reporter:
   opened:
@@ -581,26 +598,6 @@ custom_tab:
     - fenix-core@mozilla.com
     expires: "2020-03-01"
 
-preferences:
-  preference_toggled:
-    type: event
-    description: >
-      A user toggled a preference switch in settings
-    extra_keys:
-      preference_key:
-        description: "The preference key for the switch preference the user toggled. We currently track: leakcanary,
-        make_default_browser, show_search_suggestions, show_visited_sites_bookmarks, remote_debugging, telemetry,
-        tracking_protection"
-      enabled:
-        description: "Whether or not the preference is *now* enabled"
-    bugs:
-    - 975
-    data_reviews:
-    - https://github.com/mozilla-mobile/fenix/pull/1896
-    notification_emails:
-    - fenix-core@mozilla.com
-    expires: "2020-03-01"
-
 activation:
   identifier:
     type: string
diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
index 8e6da2617..268b869d9 100644
--- a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt
@@ -219,6 +219,10 @@ private val Event.wrapper
         is Event.SyncAccountSignOut -> EventWrapper<NoExtraKeys>(
             { SyncAccount.signOut.record(it) }
         )
+        is Event.PreferenceToggled -> EventWrapper(
+            { Events.preferenceToggled.record(it) },
+            { Events.preferenceToggledKeys.valueOf(it) }
+        )
 
         // Don't track other events with Glean
         else -> null