diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
index 88b5d3d06f..189bcf0877 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
@@ -337,6 +337,9 @@
                             <i class="fw fw-refresh"></i>
                         </a>
                     </span>
+                    <div id="map-spinner" class="wr-advance-operations-init hidden">
+                        <i class="fw fw-settings fw-spin fw-2x"></i> Fetching the latest location...
+                    </div>
                 </div>
                 <div id="collapseThree" class="panel-collapse collapse in" role="tabpanel"
                      aria-labelledby="device_location">
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js
index 10464f22c6..85c516ecfc 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/load-map.js
@@ -32,6 +32,8 @@ function loadLeafletMap(refresh) {
         attribution = "&copy; <a href='https://openstreetmap.org/copyright'>OpenStreetMap</a> contributors";
 
     if (refresh && !isAnalitics) {
+        console.log("holaaaa");
+        $("#map-spinner").removeClass("hidden");
         var applicationsList = $("#applications-list");
         var deviceId = applicationsList.data("device-id");
         var deviceType = applicationsList.data("device-type");
@@ -43,8 +45,10 @@ function loadLeafletMap(refresh) {
                     data = JSON.parse(data);
                     if (data.latitude && data.longitude) {
                         map.removeLayer(marker);
-                        marker = L.marker([6.912853, 79.855635], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here");
-                        // marker = L.marker([data.latitude, data.longitude], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here");
+                        // marker = L.marker([6.912853, 79.855635], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here");
+                        marker = L.marker([data.latitude, data.longitude], {"opacity": opacVal}).addTo(map).bindPopup("Your device is here");
+                        map.panTo(new L.LatLng(data.latitude, data.longitude));
+                        // map.panTo(new L.LatLng(40.737, -73.923));
                         marker.on('mouseover', function (e) {
                             this.openPopup();
                         });
@@ -52,14 +56,16 @@ function loadLeafletMap(refresh) {
                             this.closePopup();
                         });
                     }
+                    $("#map-spinner").addClass("hidden");
                 } else {
-
+                    $("#map-spinner").adddClass("hidden");
                     $("#device-location").hide();
                     $("#map-error").show();
                 }
             },
             // error-callback
             function () {
+                $("#map-spinner").addClass("hidden");
                 $("#device-location").hide();
                 $("#map-error").show();
             });