diff --git a/platypush/backend/http/webapp/src/components/panels/Entities/Modal.vue b/platypush/backend/http/webapp/src/components/panels/Entities/Modal.vue
index caa345bad1..5bc50e7a49 100644
--- a/platypush/backend/http/webapp/src/components/panels/Entities/Modal.vue
+++ b/platypush/backend/http/webapp/src/components/panels/Entities/Modal.vue
@@ -314,7 +314,7 @@ export default {
       if (value == null)
         return ''
       if (Array.isArray(value) || typeof value === 'object')
-        return JSON.stringify(value)
+        return JSON.stringify(value, null, 2)
       return '' + value
     },
   },
@@ -402,6 +402,13 @@ export default {
     }
   }
 
+  .extra-info-container {
+    .value {
+      white-space: pre-wrap;
+      opacity: 0.8;
+    }
+  }
+
   .value {
     &.url {
       text-align: right;