diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java
index b9a515255ae779daf61e37b86cc1ec54e1215f21..f258764dac9bdf57f46037855d41a453cf3a2cc1 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/search/SearchIndexProviderRegistry.java
@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.settings.search;
 import org.chromium.build.annotations.NullMarked;
 import org.chromium.chrome.browser.about_settings.AboutChromeSettings;
 import org.chromium.chrome.browser.about_settings.LegalInformationSettings;
-import org.chromium.chrome.browser.appearance.settings.AppearanceSettingsFragment;
 import org.chromium.chrome.browser.autofill.options.AutofillOptionsFragment;
 import org.chromium.chrome.browser.autofill.settings.AndroidPaymentAppsFragment;
 import org.chromium.chrome.browser.autofill.settings.AutofillBuyNowPayLaterFragment;
@@ -26,12 +25,10 @@ import org.chromium.chrome.browser.download.settings.DownloadSettings;
 import org.chromium.chrome.browser.glic.GlicSettings;
 import org.chromium.chrome.browser.homepage.settings.HomepageSettings;
 import org.chromium.chrome.browser.image_descriptions.ImageDescriptionsSettings;
-import org.chromium.chrome.browser.language.settings.LanguageSettings;
 import org.chromium.chrome.browser.night_mode.settings.ThemeSettingsFragment;
 import org.chromium.chrome.browser.prefetch.settings.PreloadPagesSettingsFragment;
 import org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings;
 import org.chromium.chrome.browser.privacy.settings.DoNotTrackSettings;
-import org.chromium.chrome.browser.privacy.settings.PrivacySettings;
 import org.chromium.chrome.browser.privacy_sandbox.AdMeasurementFragment;
 import org.chromium.chrome.browser.privacy_sandbox.FledgeAllSitesFragment;
 import org.chromium.chrome.browser.privacy_sandbox.FledgeBlockedSitesFragment;
@@ -47,7 +44,6 @@ import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
 import org.chromium.chrome.browser.safety_hub.SafetyHubFragment;
 import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
 import org.chromium.chrome.browser.search_engines.settings.SiteSearchSettings;
-import org.chromium.chrome.browser.settings.MainSettings;
 import org.chromium.chrome.browser.ssl.HttpsFirstModeSettingsFragment;
 import org.chromium.chrome.browser.sync.settings.AccountManagementFragment;
 import org.chromium.chrome.browser.sync.settings.GoogleServicesSettings;
@@ -90,7 +86,7 @@ public final class SearchIndexProviderRegistry {
                     // MainSettings always comes at the top. This fixes the order of the header
                     // groups in which they will be shown in the search results since the index
                     // uses LinkedHashMap internally.
-                    MainSettings.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.BraveMainPreferencesBase.SEARCH_INDEX_DATA_PROVIDER,
                     AboutChromeSettings.SEARCH_INDEX_DATA_PROVIDER,
                     AdaptiveToolbarSettingsFragment.SEARCH_INDEX_DATA_PROVIDER,
                     AutofillOptionsFragment.SEARCH_INDEX_DATA_PROVIDER,
@@ -129,7 +125,6 @@ public final class SearchIndexProviderRegistry {
                     SafetyHubFragment.SEARCH_INDEX_DATA_PROVIDER,
                     AccountManagementFragment.SEARCH_INDEX_DATA_PROVIDER,
                     AndroidPaymentAppsFragment.SEARCH_INDEX_DATA_PROVIDER,
-                    AppearanceSettingsFragment.SEARCH_INDEX_DATA_PROVIDER,
                     AutofillBuyNowPayLaterFragment.SEARCH_INDEX_DATA_PROVIDER,
                     AutofillCardBenefitsFragment.SEARCH_INDEX_DATA_PROVIDER,
                     AutofillIdentityDocsFragment.SEARCH_INDEX_DATA_PROVIDER,
@@ -141,10 +136,8 @@ public final class SearchIndexProviderRegistry {
                     FinancialAccountsManagementFragment.SEARCH_INDEX_DATA_PROVIDER,
                     GoogleServicesSettings.SEARCH_INDEX_DATA_PROVIDER,
                     HttpsFirstModeSettingsFragment.SEARCH_INDEX_DATA_PROVIDER,
-                    LanguageSettings.SEARCH_INDEX_DATA_PROVIDER,
                     NonCardPaymentMethodsManagementFragment.SEARCH_INDEX_DATA_PROVIDER,
                     PriceNotificationSettingsFragment.SEARCH_INDEX_DATA_PROVIDER,
-                    PrivacySettings.SEARCH_INDEX_DATA_PROVIDER,
                     SafetyCheckSettingsFragment.SEARCH_INDEX_DATA_PROVIDER,
                     TabsSettings.SEARCH_INDEX_DATA_PROVIDER,
                     ManageSyncSettings.SEARCH_INDEX_DATA_PROVIDER,
@@ -153,5 +146,30 @@ public final class SearchIndexProviderRegistry {
                     DownloadSettings.SEARCH_INDEX_DATA_PROVIDER,
                     DeveloperSettings.SEARCH_INDEX_DATA_PROVIDER,
                     TracingSettings.SEARCH_INDEX_DATA_PROVIDER,
-                    TracingCategoriesSettings.SEARCH_INDEX_DATA_PROVIDER);
+                    TracingCategoriesSettings.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.components.browser_ui.site_settings.BraveSiteSettingsPreferencesBase.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.password_manager.settings.PasswordSettings.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.playlist.settings.BravePlaylistPreferences.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.privacy.settings.BravePrivacySettings.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.BraveLeoDefaultModelPreferences.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.BraveLeoPreferences.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.BraveLicensePreferences.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.BraveOriginPreferences.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.BraveSearchEnginesPreferences.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.BraveSyncScreensPreference.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.BraveWalletNetworksPreferenceFragment.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.BraveWalletPreferences.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.BraveWebrtcPolicyPreferencesFragment.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.developer.BraveQAPreferences.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.site_settings.BraveWalletEthereumConnectedSites.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.site_settings.BraveWalletSolanaConnectedSites.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.vpn.settings.BraveVpnPreferences.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.brave.browser.customize_menu.settings.BraveCustomizeMenuPreferenceFragment.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.password_entry_edit.BlockedCredentialFragmentView.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.password_entry_edit.CredentialEditFragmentView.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.password_entry_edit.FederatedCredentialFragmentView.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.brave.browser.quick_search_engines.settings.QuickSearchEnginesFragment.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.brave.browser.custom_search_engines.settings.AddCustomSearchEnginePreferenceFragment.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.settings.AppearancePreferences.SEARCH_INDEX_DATA_PROVIDER,
+                    org.chromium.chrome.browser.language.settings.BraveLanguageSettings.SEARCH_INDEX_DATA_PROVIDER);
 }