diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Entity.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Entity.vue
index 1307ef49..daaf3227 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Entity.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Entity.vue
@@ -85,7 +85,10 @@ export default {
     },
 
     onClick(event) {
-      if (event.target.classList.contains('label')) {
+      if (
+        event.target.classList.contains('label') ||
+        event.target.classList.contains('head')
+      ) {
         event.stopPropagation()
         this.toggleCollapsed()
       }
@@ -94,7 +97,13 @@ export default {
     onEntityUpdate(entity) {
       // Check if any of the children have been updated
       const entityId = entity?.id
-      if (entityId == null || !(entityId in this.children))
+      const isChildUpdate = (
+        entityId != null &&
+        this.children &&
+        entityId in this.children
+      )
+
+      if (!isChildUpdate)
         return
 
       this.setJustUpdated()