diff --git a/app/qml/runcommand.qml b/app/qml/runcommand.qml
index 5b30ea5eb..415fc6963 100644
--- a/app/qml/runcommand.qml
+++ b/app/qml/runcommand.qml
@@ -37,6 +37,7 @@ Kirigami.Page
     }
 
     ListView {
+        id: commandsList
         anchors.fill: parent
         model: RemoteCommandsModel {
             deviceId: pluginInterface.deviceId
@@ -49,5 +50,11 @@ Kirigami.Page
         }
     }
 
+    Label {
+        visible: commandsList.count === 0
+        text: i18n("No commands defined")
+        anchors.centerIn: parent
+    }
+
 }