diff --git a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/CommandEntry.java b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/CommandEntry.java
index 07c52f8a..8050af11 100644
--- a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/CommandEntry.java
+++ b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/CommandEntry.java
@@ -29,10 +29,10 @@ class CommandEntry extends EntryItem {
     }
 
     public String getName() {
-        return title;
+        return getTitle();
     }
 
     public String getCommand() {
-        return subtitle;
+        return getSubtitle();
     }
 }
diff --git a/src/org/kde/kdeconnect/UserInterface/List/EntryItem.java b/src/org/kde/kdeconnect/UserInterface/List/EntryItem.java
deleted file mode 100644
index 37c0f522..00000000
--- a/src/org/kde/kdeconnect/UserInterface/List/EntryItem.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2014 Albert Vaca Cintora <albertvaka@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-*/
-
-package org.kde.kdeconnect.UserInterface.List;
-
-import android.view.LayoutInflater;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-
-import org.kde.kdeconnect_tp.databinding.ListItemEntryBinding;
-
-public class EntryItem implements ListAdapter.Item {
-    protected final String title;
-    protected final String subtitle;
-
-    public EntryItem(String title) {
-        this(title, null);
-    }
-
-    protected EntryItem(String title, String subtitle) {
-        this.title = title;
-        this.subtitle = subtitle;
-    }
-
-    @NonNull
-    @Override
-    public View inflateView(@NonNull LayoutInflater layoutInflater) {
-        final ListItemEntryBinding binding = ListItemEntryBinding.inflate(layoutInflater);
-
-        binding.listItemEntryTitle.setText(title);
-
-        if (subtitle != null) {
-            binding.listItemEntrySummary.setVisibility(View.VISIBLE);
-            binding.listItemEntrySummary.setText(subtitle);
-        }
-
-        return binding.getRoot();
-    }
-}
diff --git a/src/org/kde/kdeconnect/UserInterface/List/EntryItem.kt b/src/org/kde/kdeconnect/UserInterface/List/EntryItem.kt
new file mode 100644
index 00000000..23c180b7
--- /dev/null
+++ b/src/org/kde/kdeconnect/UserInterface/List/EntryItem.kt
@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
+*/
+package org.kde.kdeconnect.UserInterface.List
+
+import android.view.LayoutInflater
+import android.view.View
+import org.kde.kdeconnect_tp.databinding.ListItemEntryBinding
+
+open class EntryItem protected constructor(protected val title: String, protected val subtitle: String?) : ListAdapter.Item {
+
+    override fun inflateView(layoutInflater: LayoutInflater): View {
+        val binding = ListItemEntryBinding.inflate(layoutInflater)
+
+        binding.listItemEntryTitle.text = title
+
+        if (subtitle != null) {
+            binding.listItemEntrySummary.visibility = View.VISIBLE
+            binding.listItemEntrySummary.text = subtitle
+        }
+
+        return binding.root
+    }
+}