diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
index 4abf440dc3..e5822f5736 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.edit/edit.hbs
@@ -35,20 +35,8 @@
                     <div class="wr-form">
                         <h1 id="policy-message-page-wizard-title" class="page-sub-title">Policy is successfully
                             re-configured.</h1>
-                        <br>Please click <b>"Add Another Policy"</b>, if you wish to add another policy or click
-                        <b>"View policy list"</b> to complete the process and go back to the policy list.
-                        <hr>
-                        <button class="wr-btn wizard-stepper" data-current="policy-message"
-                                data-direct="{{@app.context}}/policies/">
-                            View policy list
-                        </button>
-                        <a href="{{@app.context}}/policies/add" class="cu-btn-inner">
-                        <span class="fw-stack">
-                            <i class="fw fw-circle-outline fw-stack-2x"></i>
-                            <i class="fw fw-add fw-stack-1x"></i>
-                        </span>
-                            Add another policy
-                        </a>
+                        <br>You will be redirected to Policy Listing page in a moment.
+                    </div>
                     </div>
                 </div>
 
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 e2a7182b6b..4bd3691b44 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
@@ -495,6 +495,9 @@ var updatePolicy = function (policy, state) {
                             if (jqXHR.status == 200) {
                                 $(".add-policy").addClass("hidden");
                                 $(".policy-message").removeClass("hidden");
+                                setTimeout(function(){
+                                    window.location.href = "/devicemgt/policies";
+                                }, 1000);
                             }
                         },
                         // on error
@@ -513,6 +516,9 @@ var updatePolicy = function (policy, state) {
                                 $(".add-policy").addClass("hidden");
                                 $(".policy-naming").addClass("hidden");
                                 $(".policy-message").removeClass("hidden");
+                                setTimeout(function(){
+                                    window.location.href = "/devicemgt/policies";
+                                }, 1000);
                             }
                         },
                         // on error