diff --git a/.changeset/happy-cameras-attend.md b/.changeset/happy-cameras-attend.md
new file mode 100644
index 000000000..be35b97c5
--- /dev/null
+++ b/.changeset/happy-cameras-attend.md
@@ -0,0 +1,5 @@
+---
+'@getodk/web-forms': patch
+---
+
+Improves the UIUX of map status bar and fit to feature
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-chromium.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-chromium.png
index 3c609692f..72814eb12 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-chromium.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-chromium.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-firefox.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-firefox.png
index ae6e1826b..c3465574c 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-firefox.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-firefox.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-webkit.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-webkit.png
index 98b223a00..87f551f0f 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-webkit.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-full-screen-webkit.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-chromium.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-chromium.png
index d3c449f17..39b59bcdd 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-chromium.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-chromium.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-firefox.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-firefox.png
index 33fc8acc6..9ddd6248d 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-firefox.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-firefox.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-webkit.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-webkit.png
index 126fd37be..9ba44a176 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-webkit.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-saved-webkit.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-chromium.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-chromium.png
index 29192a4ba..46503a46b 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-chromium.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-chromium.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-firefox.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-firefox.png
index 904a3ae63..5195d6854 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-firefox.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-firefox.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-webkit.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-webkit.png
index 9f466330d..064eb5171 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-webkit.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-point-selected-webkit.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-chromium.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-chromium.png
index 8695a5836..46503a46b 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-chromium.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-chromium.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-firefox.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-firefox.png
index 093eb73f9..e2026262f 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-firefox.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-firefox.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-webkit.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-webkit.png
index 83c2594aa..fb0d27412 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-webkit.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-removed-saved-feature-webkit.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-chromium.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-chromium.png
index c28c725ff..9d92fa482 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-chromium.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-chromium.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-firefox.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-firefox.png
index dd4c9f3a9..adda95289 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-firefox.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-firefox.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-webkit.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-webkit.png
index 608a12e3f..005a37d31 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-webkit.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-view-details-webkit.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-chromium.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-chromium.png
index ec76c5fbb..fd7aabe46 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-chromium.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-chromium.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-firefox.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-firefox.png
index e1609b5e6..509541ce6 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-firefox.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-firefox.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-webkit.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-webkit.png
index caf0ddb18..380f4660e 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-webkit.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-in-webkit.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-chromium.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-chromium.png
index c82c96d86..d6e8334c7 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-chromium.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-chromium.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-firefox.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-firefox.png
index 6792db4fd..8699e97a5 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-firefox.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-firefox.png differ
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-webkit.png b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-webkit.png
index 226114187..a805177d2 100644
Binary files a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-webkit.png and b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts-snapshots/select-map-zoom-out-webkit.png differ
diff --git a/packages/web-forms/src/components/common/map/MapBlock.vue b/packages/web-forms/src/components/common/map/MapBlock.vue
index c262943ac..e0f57a0c8 100644
--- a/packages/web-forms/src/components/common/map/MapBlock.vue
+++ b/packages/web-forms/src/components/common/map/MapBlock.vue
@@ -203,6 +203,7 @@ const toggleFullScreen = async () => {
 	isFullScreen.value = !isFullScreen.value;
 	if (!isFullScreen.value) {
 		await nextTick();
+		isAdvancedPanelOpen.value = false;
 		mapHandler.fitToAllFeatures();
 	}
 };
diff --git a/packages/web-forms/src/components/common/map/MapStatusBar.vue b/packages/web-forms/src/components/common/map/MapStatusBar.vue
index 872e44297..b806a0fb0 100644
--- a/packages/web-forms/src/components/common/map/MapStatusBar.vue
+++ b/packages/web-forms/src/components/common/map/MapStatusBar.vue
@@ -146,15 +146,13 @@ const displayState = computed(() => {
 
 <template>
 	<div class="map-status-bar" :class="{ 'full-screen-active': isFullScreen }">
-		<div v-if="isCapturing" class="map-status-container">
-			<div class="map-status">
+		<div class="map-status-container">
+			<div v-if="isCapturing" class="map-status">
 				<ProgressSpinner class="map-status-spinner" stroke-width="5px" />
 				<!-- TODO: translations -->
 				<span>Capturing location...</span>
 			</div>
-		</div>
 
-		<div class="map-status-container">
 			<div v-if="!isCapturing && displayState" class="map-status">
 				<IconSVG
 					:name="displayState.icon"
diff --git a/packages/web-forms/src/components/common/map/useMapViewControls.ts b/packages/web-forms/src/components/common/map/useMapViewControls.ts
index ab4dfeb09..14191826e 100644
--- a/packages/web-forms/src/components/common/map/useMapViewControls.ts
+++ b/packages/web-forms/src/components/common/map/useMapViewControls.ts
@@ -4,11 +4,12 @@ import type { TimerID } from '@getodk/common/types/timers.ts';
 import { Map, type View } from 'ol';
 import type { Coordinate } from 'ol/coordinate';
 import { easeOut } from 'ol/easing';
-import { getCenter, isEmpty as isExtendEmpty } from 'ol/extent';
+import { getCenter, isEmpty as isExtendEmpty, type Extent } from 'ol/extent';
 import Feature from 'ol/Feature';
 import { Point } from 'ol/geom';
 import VectorLayer from 'ol/layer/Vector';
 import { fromLonLat, toLonLat } from 'ol/proj';
+import type { Size } from 'ol/size';
 import VectorSource from 'ol/source/Vector';
 import { getDistance } from 'ol/sphere';
 import { shallowRef, watch } from 'vue';
@@ -150,27 +151,39 @@ export function useMapViewControls(mapInstance: Map): UseMapViewControls {
 		}
 	};
 
+	const resolveTargetViewSettings = (extent: Extent, view: View, size: Size) => {
+		const ZOOM_BUFFER = 1;
+		const currentResolution = view.getResolutionForExtent(extent, size);
+		const currentZoom = view.getZoomForResolution(currentResolution) ?? 0;
+		const targetZoom = currentZoom - ZOOM_BUFFER; // For better aesthetics.
+		return targetZoom > 1 ? Math.min(targetZoom, MAX_ZOOM) : MAX_ZOOM;
+	};
+
 	const centerFeatureLocation = (feature: Feature): void => {
 		const geometry = feature.getGeometry();
 		const view = mapInstance.getView();
-		const mapWidth = mapInstance.getSize()?.[0];
-		if (!geometry || !view || mapWidth == null) {
+		const size = mapInstance.getSize();
+		const extent = geometry?.getExtent() ?? [];
+		if (!geometry || !view || !size || isExtendEmpty(extent)) {
 			return;
 		}
 
+		const mapWidth = size[0] ?? 0;
 		const pixelOffsetY = mapWidth < SMALL_DEVICE_WIDTH ? -130 : 0;
 		const pixelOffsetX = mapWidth < SMALL_DEVICE_WIDTH ? 0 : -70;
 
-		const zoomResolution = view.getResolution() ?? 1;
-		const xOffsetInMapUnits = -pixelOffsetX * zoomResolution;
-		const yOffsetInMapUnits = -pixelOffsetY * zoomResolution;
+		const zoom = resolveTargetViewSettings(extent, view, size);
+		const resolution = view.getResolutionForZoom(zoom);
+
+		const xOffsetInMapUnits = -pixelOffsetX * resolution;
+		const yOffsetInMapUnits = -pixelOffsetY * resolution;
 
 		// Turning angles into usable numbers
 		const rotation = view.getRotation();
 		const cosRotation = Math.cos(rotation);
 		const sinRotation = Math.sin(rotation);
 
-		const [featureCenterLong, featureCenterLat] = getCenter(geometry.getExtent());
+		const [featureCenterLong, featureCenterLat] = getCenter(extent);
 		if (!featureCenterLong || !featureCenterLat) {
 			return;
 		}
@@ -179,8 +192,6 @@ export function useMapViewControls(mapInstance: Map): UseMapViewControls {
 			featureCenterLat - xOffsetInMapUnits * sinRotation - yOffsetInMapUnits * cosRotation,
 		];
 
-		const targetZoom = view.getZoomForResolution(zoomResolution);
-		const zoom = targetZoom ? Math.min(targetZoom, MAX_ZOOM) : MAX_ZOOM;
 		transitionToLocation(targetCoordinates, zoom);
 	};