diff --git a/app/src/main/java/com/github/libretube/SearchFragment.kt b/app/src/main/java/com/github/libretube/SearchFragment.kt
index 157d9f463..797229a44 100644
--- a/app/src/main/java/com/github/libretube/SearchFragment.kt
+++ b/app/src/main/java/com/github/libretube/SearchFragment.kt
@@ -53,6 +53,8 @@ class SearchFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
         val recyclerView = view.findViewById<RecyclerView>(R.id.search_recycler)
 
+        val autoTextView = view.findViewById<AutoCompleteTextView>(R.id.autoCompleteTextView)
+
         val historyRecycler = view.findViewById<RecyclerView>(R.id.history_recycler)
         val history_tv = view.findViewById<TextView>(R.id.tv_history)
 
@@ -64,10 +66,9 @@ class SearchFragment : Fragment() {
         history_tv.visibility = VISIBLE
 
         historyRecycler.layoutManager = LinearLayoutManager(view.context)
-        historyRecycler.adapter = SearchHistoryAdapter(requireContext(),getHistory())
+        historyRecycler.adapter = SearchHistoryAdapter(requireContext(),getHistory(),autoTextView)
 
         recyclerView.layoutManager = GridLayoutManager(view.context, 1)
-        val autoTextView = view.findViewById<AutoCompleteTextView>(R.id.autoCompleteTextView)
         autoTextView.requestFocus()
         val imm =
             requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
@@ -105,7 +106,7 @@ class SearchFragment : Fragment() {
                     recyclerView.visibility = GONE
                     historyRecycler.visibility = VISIBLE
                     history_tv.visibility = VISIBLE
-                    historyRecycler.adapter = SearchHistoryAdapter(requireContext(),getHistory())
+                    historyRecycler.adapter = SearchHistoryAdapter(requireContext(),getHistory(),autoTextView)
                 }
             }
 
diff --git a/app/src/main/java/com/github/libretube/adapters/SearchHistoryAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchHistoryAdapter.kt
index d4593f464..fb379b775 100644
--- a/app/src/main/java/com/github/libretube/adapters/SearchHistoryAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SearchHistoryAdapter.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AutoCompleteTextView
 import android.widget.TextView
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
@@ -12,7 +13,7 @@ import com.github.libretube.R
 import com.google.android.material.imageview.ShapeableImageView
 
 
-class SearchHistoryAdapter(private val context: Context, private val historyList: List<String>) :
+class SearchHistoryAdapter(private val context: Context, private val historyList: List<String> , private val editText : AutoCompleteTextView) :
     RecyclerView.Adapter<SearchHistoryViewHolder>() {
     override fun getItemCount(): Int {
         return historyList.size -1
@@ -40,6 +41,10 @@ class SearchHistoryAdapter(private val context: Context, private val historyList
                 .apply()
 
         }
+
+        holder.v.setOnClickListener {
+            editText.setText(history)
+        }
     }
 }