diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css
index 957b72af1ff..404f5d170ca 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-common.css
@@ -293,4 +293,20 @@ ul#noty_topRight_layout_container li{
 
 a.new-notification {
     text-transform: capitalize;
-}
\ No newline at end of file
+}
+
+/**
+* This is to fix the issue https://github.com/wso2/product-iots/issues/1354.
+* Proper fix should be given for this.
+*/
+.modal {
+    z-index: 1000;
+}
+
+.modal-backdrop {
+    z-index: 999;
+}
+
+.select2-container--default .select2-selection--multiple .select2-selection__choice {
+    color: #0f0f0f;
+}