diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs
index e0b66efd3e..0e6d17780d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/layouts/cdmf.layout.default.hbs
@@ -73,6 +73,7 @@ under the License. --}}
             </div>
         </footer>
 
+        {{defineZone "bottomModalContent"}}
         {{defineZone "bottomLibJs"}}
         {{defineZone "bottomJs"}}
     </body>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/modal.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/modal.hbs
index 3a700a0713..5b2cf5ca29 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/modal.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.modal/modal.hbs
@@ -16,7 +16,7 @@
   under the License.
 }}
 
-{{#zone "content"}}
+{{#zone "bottomModalContent"}}
     <div id="basic-modal-view" class="hidden modal modal-content">
         <div class="modal-header">
             <h3 class="pull-left modal-title">
@@ -43,6 +43,6 @@
     </div>
 {{/zone}}
 
-{{#zone "topJs"}}
+{{#zone "bottomJs"}}
     {{js "js/modal.js"}}
 {{/zone}}
\ No newline at end of file