diff --git a/webconsole-plugins/upnp/src/main/resources/res/upnp.js b/webconsole-plugins/upnp/src/main/resources/res/upnp.js
index 8899f7d..cf8432d 100644
--- a/webconsole-plugins/upnp/src/main/resources/res/upnp.js
+++ b/webconsole-plugins/upnp/src/main/resources/res/upnp.js
@@ -95,6 +95,7 @@
 
 	var node = treeNode(udn, name, icon, 'lightbulb').click(function() {
 		renderDevice(device);
+		return false;
 	});
 
 	var ul, hasChildren;
@@ -113,7 +114,7 @@
 	ul = $(createElement('ul'));
 	for(var i in device.children) {
 		hasChildren = true;
-		addDevice(device.children[i]);
+		ul.append( addDevice(device.children[i]) );
 	}
 	if (hasChildren) node.append(ul);