diff --git a/panels/config/zwave/zwave-groups.html b/panels/config/zwave/zwave-groups.html
index 02deb5fe7eea..09f44263b3f7 100644
--- a/panels/config/zwave/zwave-groups.html
+++ b/panels/config/zwave/zwave-groups.html
@@ -170,7 +170,12 @@
 
   computeOtherGroupNodes: function (selectedGroup) {
     if (selectedGroup === -1) return -1;
-    var associations = Object.values(this.groups[selectedGroup].value.associations);
+    var associations = [];
+    var groupnodes = Object.values(this.groups[selectedGroup].value.associations);
+    groupnodes.forEach(function (key, index) {
+      if (index === (groupnodes.length - 1)) associations.push(key);
+      else associations.push(key + ', ');
+    }); Object.values(this.groups[selectedGroup].value.associations);
     if (!associations.length) return ['None'];
     return associations;
   },