diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
index 21917011c..ca88bd53b 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
@@ -36,7 +36,7 @@
 
 {{#zone "navbarActions"}}
 {{!-- #if permissions.enroll --}}
-    <li>
+    <li id = "enroll-btn">
         <a href="javascript:toggleEnrollment()">
                                 <span class="fw-stack">
                                    <i class="fw fw-ring fw-stack-2x"></i>
@@ -51,7 +51,7 @@
         </a>
     </li>
     {{!-- /if --}}
-    <li>
+    <li id = "advanced-search-btn">
         <a href="{{appContext}}devices/search">
                                 <span class="fw-stack">
                                    <i class="fw fw-ring fw-stack-2x"></i>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
index da5d4182c..d9a7c28ea 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
@@ -452,6 +452,8 @@ function initPage() {
                     $("#loading-content").remove();
                     $("#device-table").remove();
                     $("#no-device-view").removeClass(' hidden');
+                    $("#advanced-search-btn").addClass(' hidden');
+                    $("#enroll-btn").addClass(' hidden');
                 }
             }
         }, function (message) {