diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
index 3951215c7f..2b8796f446 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -1292,7 +1292,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
      */
     var showUnifiedSearchFeature by lazyFeatureFlagPreference(
         key = appContext.getPreferenceKey(R.string.pref_key_show_unified_search),
-        default = { homescreenSections[HomeScreenSection.UNIFIED_SEARCH] == true },
+        default = { FxNimbus.features.unifiedSearch.value(appContext).enabled },
         featureFlag = FeatureFlags.unifiedSearchFeature
     )
 
diff --git a/nimbus.fml.yaml b/nimbus.fml.yaml
index eac6abd602..be090a9dfc 100644
--- a/nimbus.fml.yaml
+++ b/nimbus.fml.yaml
@@ -20,7 +20,6 @@ features:
             "recent-explorations": true,
             "pocket": true,
             "contile-top-sites": false,
-            "unified-search": false,
           }
     defaults:
       - channel: nightly
@@ -32,7 +31,6 @@ features:
             "recent-explorations": true,
             "pocket": true,
             "contile-top-sites": false,
-            "unified-search": false,
           }
         }
   nimbus-validation:
@@ -178,6 +176,17 @@ features:
               trigger: [ "I_AM_NOT_DEFAULT_BROWSER" ]
               style: "DEFAULT"
               button-label: preferences_set_as_default_browser
+  unified-search:
+    description: A feature allowing user to easily search for specified results directly in the search bar.
+    variables:
+      enabled:
+        description: If true, the feature shows up in the search bar.
+        type: Boolean
+        default: false
+    defaults:
+      - channel: nightly
+        value:
+          enabled: false
 
 types:
   objects:
@@ -268,8 +277,6 @@ types:
           description: The pocket section. This should only be available in the US.
         contile-top-sites:
           description: The sponsored shortcuts in the homescreen.
-        unified-search:
-          description: The unified search toolbar.
     MessageSurfaceId:
       description: The identity of a message surface, used in the default browser experiments
       variants: