diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
index 98b2ab00d1..03cdd769e6 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
@@ -76,8 +76,10 @@ function loadDevices() {
         return {};
     }
 
-    var fnCreatedRow = function (nRow) {
+    var fnCreatedRow = function (nRow, aData, dataIndex) {
         $(nRow).attr('data-type', 'selectable');
+        $(nRow).attr('data-deviceid', aData.deviceIdentifier);
+        $(nRow).attr('data-devicetype', aData.deviceType);
     };