diff --git a/res/layout/widget_remotecommandplugin_dialog.xml b/res/layout/widget_remote_command_plugin_dialog.xml
similarity index 88%
rename from res/layout/widget_remotecommandplugin_dialog.xml
rename to res/layout/widget_remote_command_plugin_dialog.xml
index 501ab2c1..aaf0cb36 100644
--- a/res/layout/widget_remotecommandplugin_dialog.xml
+++ b/res/layout/widget_remote_command_plugin_dialog.xml
@@ -6,7 +6,7 @@
     android:padding="20dp">
 
     <ListView
-        android:id="@+id/runcommandsdevicelist"
+        android:id="@+id/run_commands_device_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="4dp"
diff --git a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandWidgetDeviceSelector.java b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandWidgetDeviceSelector.java
index 7fcc698d..e6250da7 100644
--- a/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandWidgetDeviceSelector.java
+++ b/src/org/kde/kdeconnect/Plugins/RunCommandPlugin/RunCommandWidgetDeviceSelector.java
@@ -3,7 +3,6 @@ package org.kde.kdeconnect.Plugins.RunCommandPlugin;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Window;
-import android.widget.ListView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -11,7 +10,7 @@ import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.UserInterface.List.ListAdapter;
 import org.kde.kdeconnect.UserInterface.ThemeUtil;
-import org.kde.kdeconnect_tp.R;
+import org.kde.kdeconnect_tp.databinding.WidgetRemoteCommandPluginDialogBinding;
 
 import java.util.Comparator;
 import java.util.List;
@@ -24,11 +23,12 @@ public class RunCommandWidgetDeviceSelector extends AppCompatActivity {
 
         ThemeUtil.setUserPreferredTheme(this);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.widget_remotecommandplugin_dialog);
+
+        final WidgetRemoteCommandPluginDialogBinding binding =
+                WidgetRemoteCommandPluginDialogBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
 
         BackgroundService.RunCommand(this, service -> runOnUiThread(() -> {
-            ListView view = findViewById(R.id.runcommandsdevicelist);
-
             final List<CommandEntry> deviceItems = service.getDevices().values().stream()
                     .filter(Device::isPaired).filter(Device::isReachable)
                     .map(device -> new CommandEntry(device.getName(), null, device.getDeviceId()))
@@ -37,8 +37,8 @@ public class RunCommandWidgetDeviceSelector extends AppCompatActivity {
 
             ListAdapter adapter = new ListAdapter(RunCommandWidgetDeviceSelector.this, deviceItems);
 
-            view.setAdapter(adapter);
-            view.setOnItemClickListener((adapterView, viewContent, i, l) -> {
+            binding.runCommandsDeviceList.setAdapter(adapter);
+            binding.runCommandsDeviceList.setOnItemClickListener((adapterView, viewContent, i, l) -> {
                 CommandEntry entry = deviceItems.get(i);
                 RunCommandWidget.setCurrentDevice(entry.getKey());