diff --git a/panels/zwave/zwave-values.html b/panels/zwave/zwave-values.html
index 5115f5c5327f..376eb594e9a0 100644
--- a/panels/zwave/zwave-values.html
+++ b/panels/zwave/zwave-values.html
@@ -105,7 +105,7 @@
   },
 
   computeSelectCaption: function (item) {
-    return item.value.label;
+    return item.value.label + ' (Instance: ' + item.value.instance + ', Index: ' + item.value.index + ')';
   },
 
   computeGetValueName: function (selectedValue) {