diff --git a/plugins/keys-on-map.user.js b/plugins/keys-on-map.user.js
index 0cf301b5..43aa1338 100644
--- a/plugins/keys-on-map.user.js
+++ b/plugins/keys-on-map.user.js
@@ -106,9 +106,7 @@ window.plugin.keysOnMap.setupCSS = function() {
 }
 
 window.plugin.keysOnMap.setupLayer = function() {
-  window.layerChooser.addOverlay(window.plugin.keysOnMap.keyLayerGroup, 'Keys');
-  if(isLayerGroupDisplayed('Keys'))
-    map.addLayer(window.plugin.keysOnMap.keyLayerGroup);
+  window.addLayerGroup('Keys', window.plugin.keysOnMap.keyLayerGroup, false);
 }
 
 var setup =  function() {