diff --git a/package/gluon-config-mode-geo-location/src/0400-geo-location.lua.in b/package/gluon-config-mode-geo-location/src/0400-geo-location.lua.in
index 9fc3ef57..b5b985a9 100644
--- a/package/gluon-config-mode-geo-location/src/0400-geo-location.lua.in
+++ b/package/gluon-config-mode-geo-location/src/0400-geo-location.lua.in
@@ -25,6 +25,9 @@ return function(form, uci)
 	end
 
 	local function site_zoom()
+		if uci_longitude ~= nil and uci_latitude ~= nil then
+			return 18
+		end
 		return site.config_mode.geo_location.map.zoom(12)
 	end