diff --git a/croutonjs/meetingMap/js/meeting_map.js b/croutonjs/meetingMap/js/meeting_map.js
index b2c90835..47055474 100644
--- a/croutonjs/meetingMap/js/meeting_map.js
+++ b/croutonjs/meetingMap/js/meeting_map.js
@@ -218,11 +218,11 @@ function MeetingMap(inConfig) {
 		retrieveGeolocation().then(position => {
 			showThrobber();
 			crouton.searchByCoordinates(position.latitude, position.longitude, config.map_search.width);
+			if (activeModal == gSearchModal) closeModalWindow(gSearchModal);
 		}).catch(error => {
 			console.error(error.message);
+			if (activeModal != gSearchModal) showBmltSearchDialog();
 		});
-		showBmltSearchDialog();
-		closeModalWindow(gSearchModal);
 	};
 	function clickSearch(e) {
 		gDelegate.clickSearch(e, function(lat,lng) {
diff --git a/croutonjs/src/js/crouton-core.js b/croutonjs/src/js/crouton-core.js
index 0e907b4c..a2afa204 100644
--- a/croutonjs/src/js/crouton-core.js
+++ b/croutonjs/src/js/crouton-core.js
@@ -898,7 +898,6 @@ function Crouton(config) {
 		window.croutonMap = new MeetingMap(self.config);
 		if (self.config['map_search']) self.searchMap();
 	}
-	self.meetingSearch();
 }
 
 Crouton.prototype.setConfig = function(config) {