diff --git a/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt b/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt
index 4012ee830..0e6049259 100644
--- a/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/SearchFragment.kt
@@ -66,7 +66,7 @@ class SearchFragment : Fragment() {
 
         binding.clearSearchImageView.setOnClickListener {
             binding.autoCompleteTextView.text.clear()
-            binding.historyRecycler.visibility = View.GONE
+            binding.historyRecycler.adapter = null
             showHistory()
         }
 
@@ -129,7 +129,7 @@ class SearchFragment : Fragment() {
             }
 
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                if (s!! != "") {
+                if (s.toString() != "") {
                     binding.searchRecycler.adapter = null
 
                     binding.searchRecycler.viewTreeObserver
@@ -144,14 +144,15 @@ class SearchFragment : Fragment() {
 
             override fun afterTextChanged(s: Editable?) {
                 if (s!!.isEmpty()) {
+                    binding.historyRecycler.adapter = null
                     showHistory()
                 }
             }
         })
         binding.autoCompleteTextView.setOnEditorActionListener(
-            OnEditorActionListener { _, actionId, _ ->
-                if (actionId == EditorInfo.IME_ACTION_SEARCH) {
-                    view?.let { context?.hideKeyboard(it) }
+            OnEditorActionListener { textView, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_SEARCH && textView.text.toString() != "") {
+                    view.let { context?.hideKeyboard(it) }
                     binding.searchRecycler.visibility = VISIBLE
                     binding.historyRecycler.visibility = GONE
                     fetchSearch(binding.autoCompleteTextView.text.toString())