diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
index a0120a077..abe9b7caa 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarUIView.kt
@@ -21,6 +21,7 @@ import mozilla.components.support.ktx.android.graphics.drawable.toBitmap
import org.mozilla.fenix.R
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.mvi.UIView
+import org.mozilla.fenix.utils.Settings
class AwesomeBarUIView(
container: ViewGroup,
@@ -58,6 +59,17 @@ class AwesomeBarUIView(
)
)
+ if (Settings.getInstance(container.context).showSearchSuggestions()) {
+ view.addProviders(
+ SearchSuggestionProvider(
+ components.search.searchEngineManager.getDefaultSearchEngine(this),
+ searchUseCase,
+ components.core.client,
+ SearchSuggestionProvider.Mode.MULTIPLE_SUGGESTIONS
+ )
+ )
+ }
+
view.addProviders(
SessionSuggestionProvider(
components.core.sessionManager,
@@ -66,12 +78,6 @@ class AwesomeBarUIView(
HistoryStorageSuggestionProvider(
components.core.historyStorage,
loadUrlUseCase
- ),
- SearchSuggestionProvider(
- components.search.searchEngineManager.getDefaultSearchEngine(this),
- searchUseCase,
- components.core.client,
- SearchSuggestionProvider.Mode.MULTIPLE_SUGGESTIONS
)
)
}
diff --git a/app/src/main/res/xml/search_engine_preferences.xml b/app/src/main/res/xml/search_engine_preferences.xml
index 41d78f123..81c01084d 100644
--- a/app/src/main/res/xml/search_engine_preferences.xml
+++ b/app/src/main/res/xml/search_engine_preferences.xml
@@ -7,6 +7,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">