diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
index f67386cb..c1c411e1 100644
--- a/application/views/interface_assets/footer.php
+++ b/application/views/interface_assets/footer.php
@@ -100,6 +100,7 @@ $(document).ready(function(){
 <?php } ?>
 
 <?php if ($this->uri->segment(1) == "logbook" && $this->uri->segment(2) != "view") { ?>
+    <script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/L.Maidenhead.js"></script>
     <script type="text/javascript" src="<?php echo base_url();?>assets/js/leaflet/leafembed.js"></script>
     <script type="text/javascript">
       
@@ -114,7 +115,12 @@ $(document).ready(function(){
         var qso_loc = '<?php echo site_url('logbook/qso_map/25/'.$this->uri->segment(3)); ?>';
         var q_zoom = 2;
 
-        initmap();
+        <?php if ($this->config->item('map_gridsquares') != FALSE) { ?>
+              var grid = "Yes";
+        <?php } else { ?>
+              var grid = "No";
+        <?php } ?>
+            initmap(grid);
 
     </script>
 <?php } ?>
diff --git a/assets/js/leaflet/leafembed.js b/assets/js/leaflet/leafembed.js
index 051a9387..32c77624 100644
--- a/assets/js/leaflet/leafembed.js
+++ b/assets/js/leaflet/leafembed.js
@@ -23,11 +23,19 @@ function initmap(ShowGrid = 'No') {
 
     // start the map in South-East England
     map.setView(new L.LatLng(q_lat, q_lng), q_zoom);
-    map.addLayer(osm);
-
+	
+	map.addLayer(osm);
 	askForPlots();
+
 	map.on('moveend', onMapMove);
 
+	if(ShowGrid == "Yes") {
+		var maidenhead = L.maidenhead().addTo(map);
+	}
+
+	var layerControl = new L.Control.Layers(null, {
+    'Gridsquares': maidenhead = L.maidenhead()
+	}).addTo(map);
 }
 
 function getXmlHttpObject() {