diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.hbs
index 1bc375a190..5ef6bdedd5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.create/create.hbs
@@ -38,23 +38,10 @@
 
                 <div class="col-centered policy-message hidden">
                     <div class="wr-form">
-                        <h1 id="policy-message-page-wizard-title" class="page-sub-title">Policy creation is
-                            successful.</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.
+                        <h1 id="policy-message-page-wizard-title" class="page-sub-title">
+                            Policy creation is successful.</h1>
+                        <br>You will be redirected to Policy Listing Page in a moment.
                         <hr>
-                        <button class="wr-btn wizard-stepper" data-current="policy-message"
-                                data-direct="{{@app.context}}/policies/">
-                            View policy list
-                        </button>
-                        <!--suppress HtmlUnknownTarget -->
-                        <a href="{{@app.context}}/policy/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>
                     </div>
                 </div>
 
@@ -82,9 +69,7 @@
                                             <!--suppress HtmlFormInputWithoutLabel -->
                                             <input id="policy-name-input" class="form-control" type="text" value=""/>
                                             <label class="error nameEmpty hidden" for="summary">Policy name is required
-                                                &
-                                                Should be be 1-to-30
-                                                characters long.</label>
+                                                & Should be be 1-to-30 characters long.</label>
                                         </div>
                                         <br class="c-both"/>
                                     </div>
@@ -285,7 +270,7 @@
                                 </div>
                                 {{#unless types}}
                                     <h3><i class="icon fw fw-warning"></i> No compatible device types have been installed.
-                                        Install device types to add policies.</h3>
+                                                                           Install device types to add policies.</h3>
                                 {{/unless}}
                                 <div class="row wr-tile-buttons-list">
                                     <div class="wr-input-control">
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 ab7db6eeb4..a4d03689b6 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
@@ -428,6 +428,8 @@ var savePolicy = function (policy, isActive, serviceURL) {
             $(".add-policy").addClass("hidden");
             $(".policy-naming").addClass("hidden");
             $(".policy-message").removeClass("hidden");
+            setTimeout(function(){}, 1000);
+            window.location.href = "/devicemgt/policies";
         },
         function (data) {
         }