diff --git a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt
index fb90efd27..a86d7eb97 100644
--- a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt
@@ -83,6 +83,10 @@ class SearchResultsFragment : BaseFragment(R.layout.fragment_search_result),
             imgActionSecondary.setOnClickListener {
                 findNavController().navigate(R.id.downloadFragment)
             }
+            clearButton.apply {
+                visibility = if (query.isNullOrBlank()) View.GONE else View.VISIBLE
+                setOnClickListener { searchView.text?.clear() }
+            }
         }
 
         // Search
@@ -209,7 +213,11 @@ class SearchResultsFragment : BaseFragment(R.layout.fragment_search_result),
             }
 
             override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-
+                if (s.isNotEmpty()) {
+                    binding.layoutViewToolbar.clearButton.visibility = View.VISIBLE
+                } else {
+                    binding.layoutViewToolbar.clearButton.visibility = View.GONE
+                }
             }
 
             override fun afterTextChanged(s: Editable) {}
diff --git a/app/src/main/java/com/aurora/store/view/ui/search/SearchSuggestionFragment.kt b/app/src/main/java/com/aurora/store/view/ui/search/SearchSuggestionFragment.kt
index 2842bd928..3b88b0dbb 100644
--- a/app/src/main/java/com/aurora/store/view/ui/search/SearchSuggestionFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/search/SearchSuggestionFragment.kt
@@ -65,6 +65,10 @@ class SearchSuggestionFragment : Fragment(R.layout.fragment_search_suggestion) {
             imgActionSecondary.setOnClickListener {
                 findNavController().navigate(R.id.downloadFragment)
             }
+            clearButton.apply {
+                visibility = if (query.isBlank()) View.GONE else View.VISIBLE
+                setOnClickListener { searchView.text?.clear() }
+            }
         }
 
         viewModel.liveSearchSuggestions.observe(viewLifecycleOwner) {
@@ -115,6 +119,9 @@ class SearchSuggestionFragment : Fragment(R.layout.fragment_search_suggestion) {
                     if (query.isNotEmpty()) {
                         viewModel.observeStreamBundles(query)
                     }
+                    binding.layoutToolbarSearch.clearButton.visibility = View.VISIBLE
+                } else {
+                    binding.layoutToolbarSearch.clearButton.visibility = View.GONE
                 }
             }
 
diff --git a/app/src/main/res/layout/view_toolbar_search.xml b/app/src/main/res/layout/view_toolbar_search.xml
index 5c6fadfcc..d80dd65a8 100644
--- a/app/src/main/res/layout/view_toolbar_search.xml
+++ b/app/src/main/res/layout/view_toolbar_search.xml
@@ -51,6 +51,18 @@
         android:paddingEnd="@dimen/padding_normal"
         android:singleLine="true" />
 
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/clearButton"
+        style="@style/Widget.Material3.Button.IconButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_toStartOf="@id/img_action_secondary"
+        android:contentDescription="@string/details_changelog"
+        android:visibility="gone"
+        app:icon="@drawable/ic_cancel"
+        app:iconTint="?attr/colorControlNormal" />
+
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/img_action_secondary"
         android:layout_width="@dimen/icon_size_default"