diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4196d2503..a7a700e73 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,6 +41,9 @@
 
 		<service android:name=".ui.download.DownloadService" />
 
+		<provider
+			android:name=".domain.search.MangaSuggestionsProvider"
+			android:authorities="${applicationId}.MangaSuggestionsProvider" />
 		<provider
 			android:name="androidx.core.content.FileProvider"
 			android:authorities="${applicationId}.files"
diff --git a/app/src/main/java/org/koitharu/kotatsu/domain/search/MangaSuggestionsProvider.kt b/app/src/main/java/org/koitharu/kotatsu/domain/search/MangaSuggestionsProvider.kt
new file mode 100644
index 000000000..cb449c4e6
--- /dev/null
+++ b/app/src/main/java/org/koitharu/kotatsu/domain/search/MangaSuggestionsProvider.kt
@@ -0,0 +1,29 @@
+package org.koitharu.kotatsu.domain.search
+
+import android.content.Context
+import android.content.SearchRecentSuggestionsProvider
+import android.provider.SearchRecentSuggestions
+import org.koitharu.kotatsu.BuildConfig
+
+class MangaSuggestionsProvider : SearchRecentSuggestionsProvider() {
+
+	init {
+		setupSuggestions(AUTHORITY, MODE)
+	}
+
+	companion object {
+
+		fun saveQuery(context: Context, query: String) {
+			SearchRecentSuggestions(context, AUTHORITY, MODE)
+				.saveRecentQuery(query, null)
+		}
+
+		fun clearHistory(context: Context) {
+			SearchRecentSuggestions(context, AUTHORITY, MODE)
+				.clearHistory()
+		}
+
+		private const val AUTHORITY = "${BuildConfig.APPLICATION_ID}.MangaSuggestionsProvider"
+		private const val MODE = DATABASE_MODE_QUERIES
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchActivity.kt b/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchActivity.kt
index 59b1165b8..13ca3dc9d 100644
--- a/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/ui/search/SearchActivity.kt
@@ -4,6 +4,7 @@ import android.app.SearchManager
 import android.content.Intent
 import android.os.Bundle
 import org.koitharu.kotatsu.R
+import org.koitharu.kotatsu.domain.search.MangaSuggestionsProvider
 import org.koitharu.kotatsu.ui.common.BaseActivity
 
 class SearchActivity : BaseActivity() {
@@ -20,6 +21,7 @@ class SearchActivity : BaseActivity() {
 			finish()
 			return
 		}
+		MangaSuggestionsProvider.saveQuery(this, query)
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 		title = query
 		supportActionBar?.setSubtitle(R.string.search_results)
diff --git a/app/src/main/res/xml/search.xml b/app/src/main/res/xml/search.xml
index 161c80dd9..df926a5b3 100644
--- a/app/src/main/res/xml/search.xml
+++ b/app/src/main/res/xml/search.xml
@@ -4,5 +4,7 @@
 	android:hint="@string/search_manga"
 	android:inputType="textPersonName"
 	android:label="@string/app_name"
+	android:searchSuggestAuthority="org.koitharu.kotatsu.MangaSuggestionsProvider"
+	android:searchSuggestSelection=" ?"
 	android:voiceLanguageModel="web_search"
 	android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" />