diff --git a/js/Map.js b/js/Map.js
index 5243f80..ad4afc9 100644
--- a/js/Map.js
+++ b/js/Map.js
@@ -113,10 +113,17 @@ BR.Map = {
 
         layersControl = L.control.layers(baseLayers, overlays).addTo(map);
 
+        L.control.locate({
+            icon: 'glyphicon glyphicon-screenshot',
+            iconLoading: 'glyphicon glyphicon-refresh',
+        }).addTo(map);
+
+        L.control.scale().addTo(map);
+
         // expose map instance for console debugging
         BR.debug = BR.debug || {};
         BR.debug.map = map;
-        
+
         return {
             map: map,
             layersControl: layersControl
diff --git a/js/index.js b/js/index.js
index 61569fd..d9ea868 100644
--- a/js/index.js
+++ b/js/index.js
@@ -32,11 +32,6 @@
         // left sidebar as additional control position
         map._controlCorners[leftPaneId] = L.DomUtil.create('div', 'leaflet-' + leftPaneId, map._controlContainer);
 
-        L.control.locate({
-            icon: 'glyphicon glyphicon-screenshot',
-            iconLoading: 'glyphicon glyphicon-refresh',
-        }).addTo(map);
-
         document.getElementById('about_link').onclick = function() {
             bootbox.alert({
                 title: 'About',
@@ -276,8 +271,6 @@
             routing: routing,
             profile: profile
         }).addTo(map);
-
-        L.control.scale().addTo(map);
     }
 
     mapContext = BR.Map.initMap();