diff --git a/portal/web/src/main/java/org/gatein/portal/web/page/JSONContainerAdapter.java b/portal/web/src/main/java/org/gatein/portal/web/page/JSONContainerAdapter.java
index a8c1fc1db..51b6d40ed 100644
--- a/portal/web/src/main/java/org/gatein/portal/web/page/JSONContainerAdapter.java
+++ b/portal/web/src/main/java/org/gatein/portal/web/page/JSONContainerAdapter.java
@@ -65,7 +65,9 @@ public String getId(JSON node) {
 
     @Override
     public String getName(JSON node) {
-        String name = node.getString("storageName");
+        String type = node.getString("type");
+        JSON data = "container".equalsIgnoreCase(type) ? node.getJSON("container") : node.getJSON("application");
+        String name = data.getString("storageName");
         if (name == null) {
             // For now we generate a name
             // however the name should be fully provided by the node (possibly randomly generated)