diff --git a/plugins/tiddlywiki/geospatial/widgets/geomap.js b/plugins/tiddlywiki/geospatial/widgets/geomap.js
index 326eeea24..3595acc1f 100644
--- a/plugins/tiddlywiki/geospatial/widgets/geomap.js
+++ b/plugins/tiddlywiki/geospatial/widgets/geomap.js
@@ -149,7 +149,7 @@ GeomapWidget.prototype.refreshMap = function() {
 	// Create the default base map if none was specified
 	if(this.renderedBaseLayers.length === 0) {
 		// Render in reverse order so that the first tagged base layer will be rendered last, and hence take priority
-		var baseLayerTitles = this.wiki.getTiddlersWithTag("$:/tags/GeoBaseLayer").reverse();
+		var baseLayerTitles = this.wiki.filterTiddlers("[all[tiddlers+shadows]tag[$:/tags/GeoBaseLayer]]");
 		$tw.utils.each(baseLayerTitles,function(title) {
 			loadBaseLayer({title: title});
 		});