diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
index c839877f0..1c1eefcfd 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/public/js/policy-create.js
@@ -2790,6 +2790,26 @@ $(document).ready(function () {
         }
     });
 
+    // <start - fixing feature-configuring switch double-click issue>
+    $(advanceOperations).on('hidden.bs.collapse', function (event) {
+        var collapsedFeatureBody = event.target.id;
+        var featureConfiguringSwitch = "#" + collapsedFeatureBody.
+            substr(0, collapsedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
+        if ($(featureConfiguringSwitch).prop("checked") == true) {
+            $(featureConfiguringSwitch).prop("checked", false);
+        }
+    });
+
+    $(advanceOperations).on('shown.bs.collapse', function (event) {
+        var expandedFeatureBody = event.target.id;
+        var featureConfiguringSwitch = "#" + expandedFeatureBody.
+            substr(0, expandedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
+        if ($(featureConfiguringSwitch).prop("checked") == false) {
+            $(featureConfiguringSwitch).prop("checked", true);
+        }
+    });
+    // <end - fixing feature-configuring switch double-click issue>
+
     // adding support for cloning multiple profiles per feature with cloneable class definitions
     $(advanceOperations).on("click", ".multi-view.add.enabled", function () {
         // get a copy of .cloneable and create new .cloned div element
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
index 23df93491..7c899b3cb 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.edit/public/js/edit.js
@@ -2553,21 +2553,25 @@ $(document).ready(function () {
         }
     });
 
-
-    $(advanceOperations).on('hidden.bs.collapse', function () {
-        if($(this).find('input').prop('checked')){
-            $(this).find('input').prop('checked',false);
+    // <start - fixing feature-configuring switch double-click issue>
+    $(advanceOperations).on('hidden.bs.collapse', function (event) {
+        var collapsedFeatureBody = event.target.id;
+        var featureConfiguringSwitch = "#" + collapsedFeatureBody.
+            substr(0, collapsedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
+        if ($(featureConfiguringSwitch).prop("checked") == true) {
+            $(featureConfiguringSwitch).prop("checked", false);
         }
     });
 
-
-    $(advanceOperations).on('shown.bs.collapse', function () {
-        if($(this).find('input').prop('checked') == false){
-            $(this).find('input').prop('checked',true);
+    $(advanceOperations).on('shown.bs.collapse', function (event) {
+        var expandedFeatureBody = event.target.id;
+        var featureConfiguringSwitch = "#" + expandedFeatureBody.
+            substr(0, expandedFeatureBody.lastIndexOf("-")) + "-heading input[type=checkbox]";
+        if ($(featureConfiguringSwitch).prop("checked") == false) {
+            $(featureConfiguringSwitch).prop("checked", true);
         }
     });
-
-
+    // <end - fixing feature-configuring switch double-click issue>
 
     // adding support for cloning multiple profiles per feature with cloneable class definitions
     $(advanceOperations).on("click", ".multi-view.add.enabled", function () {