diff --git a/frappe/public/js/frappe/form/controls/geolocation.js b/frappe/public/js/frappe/form/controls/geolocation.js
index 37d799e96d..29d36539ec 100644
--- a/frappe/public/js/frappe/form/controls/geolocation.js
+++ b/frappe/public/js/frappe/form/controls/geolocation.js
@@ -73,15 +73,8 @@ frappe.ui.form.ControlGeolocation = class ControlGeolocation extends frappe.ui.f
 			})
 		);
 		this.add_non_group_layers(data_layers, this.editableLayers);
-		try {
-			this.map.fitBounds(this.editableLayers.getBounds(), {
-				padding: [50, 50],
-			});
-		} catch (err) {
-			// suppress error if layer has a point.
-		}
 		this.editableLayers.addTo(this.map);
-		this.map.invalidateSize();
+		this.fit_and_recenter_map();
 	}
 
 	bind_leaflet_map() {
@@ -205,4 +198,20 @@ frappe.ui.form.ControlGeolocation = class ControlGeolocation extends frappe.ui.f
 			this.editableLayers.removeLayer(l);
 		});
 	}
+
+	fit_and_recenter_map() {
+		// Spread map across the wrapper, recenter and zoom w.r.t bounds
+		try {
+			this.map.invalidateSize();
+			this.map.fitBounds(this.editableLayers.getBounds(), {
+				padding: [50, 50],
+			});
+		} catch (err) {
+			// suppress error if layer has a point.
+		}
+	}
+
+	on_section_collapse(hide) {
+		!hide && this.fit_and_recenter_map();
+	}
 };