diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
index 1810a7c5c..15904169d 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleDetails.java
@@ -189,7 +189,9 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
         return SPUIComponentIdProvider.TARGET_DETAILS_HEADER_LABEL_ID;
     }
     
-    private void populateMetadataDetails(){
+    
+    @Override
+    protected void populateMetadataDetails(){
         swmMetadataTable.populateSMMetadata(getSelectedBaseEntity());
    }
     
@@ -215,8 +217,9 @@ public class SoftwareModuleDetails extends AbstractNamedVersionedEntityTableDeta
 
     @Override
     protected void showMetadata(ClickEvent event) {
-        UI.getCurrent().addWindow(swMetadataPopupLayout.getWindow(getSelectedBaseEntity(),null));
-            
+        SoftwareModule swmodule = softwareManagement.findSoftwareModuleWithDetails(getSelectedBaseEntityId());
+                /* display the window */
+        UI.getCurrent().addWindow(swMetadataPopupLayout.getWindow(swmodule,null));
     }
     
 }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
index 4732aa23c..a3c9dd6c7 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractTableDetailsLayout.java
@@ -221,6 +221,7 @@ public abstract class AbstractTableDetailsLayout<T extends NamedEntity> extends
         populateLog();
         populateDescription();
         populateDetailsWidget();
+        populateMetadataDetails();
     }
 
     protected void populateLog() {
@@ -339,6 +340,8 @@ public abstract class AbstractTableDetailsLayout<T extends NamedEntity> extends
     }
 
     protected abstract void populateDetailsWidget();
+    
+    protected abstract void populateMetadataDetails();
 
     protected Long getSelectedBaseEntityId() {
         return selectedBaseEntity == null ? null : selectedBaseEntity.getId();
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
index b875f3a7a..368932d6c 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetDetails.java
@@ -272,7 +272,8 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
         }
     }
     
-    private void populateMetadataDetails(){
+    @Override
+    protected void populateMetadataDetails(){
         dsMetadataTable.populateDSMetadata(getSelectedBaseEntity());
    }
     
@@ -404,6 +405,11 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
         return true;
     }
     
+     @Override
+    protected Boolean isMetadataIconToBeDisplayed() {
+        return true;
+    }
+    
     @Override
     protected String getShowMetadataButtonId() {
         DistributionSetIdName lastselectedDistDS = manageDistUIState.getLastSelectedDistribution().isPresent() ? manageDistUIState
@@ -422,6 +428,7 @@ public class DistributionSetDetails extends AbstractNamedVersionedEntityTableDet
 
     @Override
     protected void showMetadata(ClickEvent event) {
-        UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(getSelectedBaseEntity(),null));        
+        DistributionSet ds = distributionSetManagement.findDistributionSetByIdWithDetails(getSelectedBaseEntityId());
+        UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(ds,null));
     }
 }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
index b730ede3a..6cec80028 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleDetails.java
@@ -197,7 +197,8 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
         return SPUIComponentIdProvider.TARGET_DETAILS_HEADER_LABEL_ID;
     }
     
-    private void populateMetadataDetails() {
+    @Override
+    protected void populateMetadataDetails() {
         swmMetadataTable.populateSMMetadata(getSelectedBaseEntity());
     }
 
@@ -222,6 +223,7 @@ public class SwModuleDetails extends AbstractNamedVersionedEntityTableDetailsLay
 
     @Override
     protected void showMetadata(ClickEvent event) {
-        UI.getCurrent().addWindow(swMetadataPopupLayout.getWindow(getSelectedBaseEntity(),null));
+        SoftwareModule swmodule = softwareManagement.findSoftwareModuleWithDetails(getSelectedBaseEntityId());
+        UI.getCurrent().addWindow(swMetadataPopupLayout.getWindow(swmodule, null));
     }
 }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
index 2f6c6b5e3..61f43ebfd 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionDetails.java
@@ -158,7 +158,9 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
 
     }
     
-    private void populateMetadataDetails(){
+    
+    @Override
+    protected void populateMetadataDetails(){
         dsMetadataTable.populateDSMetadata(getSelectedBaseEntity());
    }
 
@@ -227,7 +229,8 @@ public class DistributionDetails extends AbstractNamedVersionedEntityTableDetail
 
     @Override
     protected void showMetadata(ClickEvent event) {
-        UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(getSelectedBaseEntity(),null));        
+        DistributionSet ds = distributionSetManagement.findDistributionSetByIdWithDetails(getSelectedBaseEntityId());
+        UI.getCurrent().addWindow(dsMetadataPopupLayout.getWindow(ds,null));
     }
     
 }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java
index 6e694af03..997f3f794 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java
@@ -263,4 +263,9 @@ public class TargetDetails extends AbstractTableDetailsLayout<Target> {
         //No implementation required
     }
 
+    @Override
+    protected void populateMetadataDetails() {
+        //No implementation required
+    }
+
 }