diff --git a/plugins/keys-on-map.user.js b/plugins/keys-on-map.user.js
index 02658585..0cf301b5 100644
--- a/plugins/keys-on-map.user.js
+++ b/plugins/keys-on-map.user.js
@@ -1,7 +1,7 @@
 // ==UserScript==
 // @id             iitc-plugin-keys-on-map@xelio
 // @name           IITC plugin: Keys on map
-// @version        0.1.0.@@DATETIMEVERSION@@
+// @version        0.2.0.@@DATETIMEVERSION@@
 // @namespace      https://github.com/jonatkins/ingress-intel-total-conversion
 // @updateURL      @@UPDATEURL@@
 // @downloadURL    @@DOWNLOADURL@@
@@ -90,7 +90,7 @@ window.plugin.keysOnMap.disableMessage = function() {
   }
 }
 
-var setup =  function() {
+window.plugin.keysOnMap.setupCSS = function() {
   $("<style>")
     .prop("type", "text/css")
     .html(".plugin-keys-on-map-key {\
@@ -103,9 +103,18 @@ var setup =  function() {
             -webkit-text-size-adjust:none;\
           }")
   .appendTo("head");
+}
 
+window.plugin.keysOnMap.setupLayer = function() {
   window.layerChooser.addOverlay(window.plugin.keysOnMap.keyLayerGroup, 'Keys');
-  map.addLayer(window.plugin.keysOnMap.keyLayerGroup);
+  if(isLayerGroupDisplayed('Keys'))
+    map.addLayer(window.plugin.keysOnMap.keyLayerGroup);
+}
+
+var setup =  function() {
+
+  window.plugin.keysOnMap.setupCSS();
+  window.plugin.keysOnMap.setupLayer();
 
   // Avoid error if this plugin load first
   if($.inArray('pluginKeysUpdateKey', window.VALID_HOOKS) < 0)