diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionItem.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionItem.java
deleted file mode 100644
index 83f68dbb5..000000000
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionItem.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.schabi.newpipe.fragments.list.search;
-
-import androidx.annotation.NonNull;
-
-public class SuggestionItem {
-    final boolean fromHistory;
-    public final String query;
-
-    public SuggestionItem(final boolean fromHistory, final String query) {
-        this.fromHistory = fromHistory;
-        this.query = query;
-    }
-
-    @Override
-    public boolean equals(final Object o) {
-        if (o instanceof SuggestionItem) {
-            return query.equals(((SuggestionItem) o).query);
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return query.hashCode();
-    }
-
-    @NonNull
-    @Override
-    public String toString() {
-        return "[" + fromHistory + "→" + query + "]";
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionItem.kt b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionItem.kt
new file mode 100644
index 000000000..052e65d90
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionItem.kt
@@ -0,0 +1,14 @@
+package org.schabi.newpipe.fragments.list.search
+
+class SuggestionItem(@JvmField val fromHistory: Boolean, @JvmField val query: String) {
+    override fun equals(other: Any?): Boolean {
+        if (other is SuggestionItem) {
+            return query == other.query
+        }
+        return false
+    }
+
+    override fun hashCode() = query.hashCode()
+
+    override fun toString() = "[$fromHistory→$query]"
+}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
deleted file mode 100644
index 6a330be0f..000000000
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.schabi.newpipe.fragments.list.search;
-
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.DiffUtil;
-import androidx.recyclerview.widget.ListAdapter;
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.databinding.ItemSearchSuggestionBinding;
-
-public class SuggestionListAdapter
-        extends ListAdapter<SuggestionItem, SuggestionListAdapter.SuggestionItemHolder> {
-    private OnSuggestionItemSelected listener;
-
-    public SuggestionListAdapter() {
-        super(new SuggestionItemCallback());
-    }
-
-    public void setListener(final OnSuggestionItemSelected listener) {
-        this.listener = listener;
-    }
-
-    @NonNull
-    @Override
-    public SuggestionItemHolder onCreateViewHolder(@NonNull final ViewGroup parent,
-                                                   final int viewType) {
-        return new SuggestionItemHolder(ItemSearchSuggestionBinding
-                .inflate(LayoutInflater.from(parent.getContext()), parent, false));
-    }
-
-    @Override
-    public void onBindViewHolder(final SuggestionItemHolder holder, final int position) {
-        final SuggestionItem currentItem = getItem(position);
-        holder.updateFrom(currentItem);
-        holder.itemBinding.suggestionSearch.setOnClickListener(v -> {
-            if (listener != null) {
-                listener.onSuggestionItemSelected(currentItem);
-            }
-        });
-        holder.itemBinding.suggestionSearch.setOnLongClickListener(v -> {
-            if (listener != null) {
-                listener.onSuggestionItemLongClick(currentItem);
-            }
-            return true;
-        });
-        holder.itemBinding.suggestionInsert.setOnClickListener(v -> {
-            if (listener != null) {
-                listener.onSuggestionItemInserted(currentItem);
-            }
-        });
-    }
-
-    public interface OnSuggestionItemSelected {
-        void onSuggestionItemSelected(SuggestionItem item);
-
-        void onSuggestionItemInserted(SuggestionItem item);
-
-        void onSuggestionItemLongClick(SuggestionItem item);
-    }
-
-    public static final class SuggestionItemHolder extends RecyclerView.ViewHolder {
-        private final ItemSearchSuggestionBinding itemBinding;
-
-        private SuggestionItemHolder(final ItemSearchSuggestionBinding binding) {
-            super(binding.getRoot());
-            this.itemBinding = binding;
-        }
-
-        private void updateFrom(final SuggestionItem item) {
-            itemBinding.itemSuggestionIcon.setImageResource(item.fromHistory ? R.drawable.ic_history
-                    : R.drawable.ic_search);
-            itemBinding.itemSuggestionQuery.setText(item.query);
-        }
-    }
-
-    private static final class SuggestionItemCallback
-            extends DiffUtil.ItemCallback<SuggestionItem> {
-        @Override
-        public boolean areItemsTheSame(@NonNull final SuggestionItem oldItem,
-                                       @NonNull final SuggestionItem newItem) {
-            return oldItem.fromHistory == newItem.fromHistory
-                    && oldItem.query.equals(newItem.query);
-        }
-
-        @Override
-        public boolean areContentsTheSame(@NonNull final SuggestionItem oldItem,
-                                          @NonNull final SuggestionItem newItem) {
-            return true; // items' contents never change; the list of items themselves does
-        }
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.kt b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.kt
new file mode 100644
index 000000000..1d0a451bf
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.kt
@@ -0,0 +1,68 @@
+package org.schabi.newpipe.fragments.list.search
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.schabi.newpipe.R
+import org.schabi.newpipe.databinding.ItemSearchSuggestionBinding
+import org.schabi.newpipe.fragments.list.search.SuggestionListAdapter.SuggestionItemHolder
+
+class SuggestionListAdapter :
+    ListAdapter<SuggestionItem, SuggestionItemHolder>(SuggestionItemCallback()) {
+
+    var listener: OnSuggestionItemSelected? = null
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SuggestionItemHolder {
+        return SuggestionItemHolder(
+            ItemSearchSuggestionBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        )
+    }
+
+    override fun onBindViewHolder(holder: SuggestionItemHolder, position: Int) {
+        val currentItem = getItem(position)
+        holder.updateFrom(currentItem)
+        holder.binding.suggestionSearch.setOnClickListener {
+            listener?.onSuggestionItemSelected(currentItem)
+        }
+        holder.binding.suggestionSearch.setOnLongClickListener {
+            listener?.onSuggestionItemLongClick(currentItem)
+            true
+        }
+        holder.binding.suggestionInsert.setOnClickListener {
+            listener?.onSuggestionItemInserted(currentItem)
+        }
+    }
+
+    interface OnSuggestionItemSelected {
+        fun onSuggestionItemSelected(item: SuggestionItem)
+
+        fun onSuggestionItemInserted(item: SuggestionItem)
+
+        fun onSuggestionItemLongClick(item: SuggestionItem)
+    }
+
+    class SuggestionItemHolder(val binding: ItemSearchSuggestionBinding) :
+        RecyclerView.ViewHolder(binding.getRoot()) {
+        fun updateFrom(item: SuggestionItem) {
+            binding.itemSuggestionIcon.setImageResource(
+                if (item.fromHistory)
+                    R.drawable.ic_history
+                else
+                    R.drawable.ic_search
+            )
+            binding.itemSuggestionQuery.text = item.query
+        }
+    }
+
+    private class SuggestionItemCallback : DiffUtil.ItemCallback<SuggestionItem>() {
+        override fun areItemsTheSame(oldItem: SuggestionItem, newItem: SuggestionItem): Boolean {
+            return oldItem.fromHistory == newItem.fromHistory && oldItem.query == newItem.query
+        }
+
+        override fun areContentsTheSame(oldItem: SuggestionItem, newItem: SuggestionItem): Boolean {
+            return true // items' contents never change; the list of items themselves does
+        }
+    }
+}