diff --git a/umap/static/umap/js/umap.controls.js b/umap/static/umap/js/umap.controls.js
index 33d0c282..8fc6a5df 100644
--- a/umap/static/umap/js/umap.controls.js
+++ b/umap/static/umap/js/umap.controls.js
@@ -795,13 +795,14 @@ U.TileLayerControl = L.Control.IconLayers.extend({
         }
       })
     }
+    this._allLayers = layers
     L.Control.IconLayers.prototype.setLayers.call(this, layers.slice(0, this.maxShown))
     if (this.map.selected_tilelayer) this.setActiveLayer(this.map.selected_tilelayer)
   },
 
   _createLayerElements: function () {
     L.Control.IconLayers.prototype._createLayerElements.call(this)
-    if (Object.keys(this._layers).length <= this.maxShown) return
+    if (Object.keys(this._allLayers).length <= this.maxShown) return
     const lastRow = this._container.querySelector(
       '.leaflet-iconLayers-layersRow:last-child'
     )