diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js
index c1be205a63..e36069f802 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/policy.js
@@ -223,7 +223,13 @@ policyModule = function () {
                             appObjectToView = {};
                             appObjectToView["appName"] = appObjectFromRestEndpoint["name"];
                             appObjectToView["appId"] = appObjectFromRestEndpoint["id"];
-                            appObjectToView["packageName"] = appObjectFromRestEndpoint["appmeta"]["package"];
+                            if ("webapp" === appObjectFromRestEndpoint["platform"]) {
+                                appObjectToView["packageName"] = appObjectFromRestEndpoint["appmeta"]["weburl"];
+                                appObjectToView["type"] = "Web Clip"
+                            } else {
+                                appObjectToView["packageName"] = appObjectFromRestEndpoint["appmeta"]["package"];
+                                appObjectToView["type"] = "Mobile App"
+                            }
                             appObjectToView["version"] = appObjectFromRestEndpoint["version"];
                             appObjectToView["platform"] = appObjectFromRestEndpoint["platform"];
                             storeApps.push(appObjectToView);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
index 8486e15031..ca52864f3f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/public/js/policy-create.js
@@ -202,7 +202,7 @@ function getStoreApps(storeApps, deviceType) {
     var selectedApps = [];
     var i;
     for (i=0; i<storeApps.length; i++) {
-        if (deviceType === storeApps[i].platform) {
+        if (deviceType === storeApps[i].platform || "webapp" === storeApps[i].platform) {
             selectedApps.push(storeApps[i]);
         }
     }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
index 7c789b2109..5ae9a68539 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/public/js/policy-edit.js
@@ -259,7 +259,7 @@ function getStoreApps(storeApps, deviceType) {
     var selectedApps = [];
     var i;
     for (i=0; i<storeApps.length; i++) {
-        if (storeApps[i].platform === deviceType) {
+        if (storeApps[i].platform === deviceType || "webapp" === storeApps[i].platform) {
             selectedApps.push(storeApps[i]);
         }
     }