diff --git a/.changeset/brown-mice-rescue.md b/.changeset/brown-mice-rescue.md
new file mode 100644
index 000000000..5828f3ecf
--- /dev/null
+++ b/.changeset/brown-mice-rescue.md
@@ -0,0 +1,5 @@
+---
+'@getodk/web-forms': minor
+---
+
+Remove long-press interactions in maps
diff --git a/packages/web-forms/e2e/page-objects/controls/MapControl.ts b/packages/web-forms/e2e/page-objects/controls/MapControl.ts
index d8e2662e6..2ac37fb63 100644
--- a/packages/web-forms/e2e/page-objects/controls/MapControl.ts
+++ b/packages/web-forms/e2e/page-objects/controls/MapControl.ts
@@ -58,7 +58,7 @@ export class MapControl {
 		await this.page.mouse.up();
 	}
 
-	async longPressMap(mapComponent: Locator, moveX: number, moveY: number) {
+	async tapToAddPoint(mapComponent: Locator, moveX: number, moveY: number) {
 		const box = await mapComponent.locator(this.MAP_CONTAINER_SELECTOR).boundingBox();
 		if (!box) {
 			return;
@@ -69,7 +69,7 @@ export class MapControl {
 
 		await this.page.mouse.move(centerX + moveX, centerY + moveY);
 		await this.page.mouse.down();
-		await this.page.waitForTimeout(1400); // Press and hold
+		await this.page.waitForTimeout(200); // Press
 		await this.page.mouse.up();
 		await this.page.waitForTimeout(300); // Process point
 	}
diff --git a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts
index a2bcea425..eabfd6a2b 100644
--- a/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts
+++ b/packages/web-forms/e2e/test-cases/visual/all-question-types.test.ts
@@ -126,7 +126,7 @@ test.describe('All Question Types (Visual)', () => {
 		});
 
 		test('adds a new point elsewhere, removes saved point', async () => {
-			await formPage.map.longPressMap(mapComponent, 100, 100);
+			await formPage.map.tapToAddPoint(mapComponent, 100, 100);
 			await formPage.map.expectMapScreenshot(mapComponent, 'placement-map-new-point-saved.png');
 
 			await formPage.map.removeSavedPoint(mapComponent);
@@ -184,10 +184,10 @@ test.describe('All Question Types (Visual)', () => {
 			await formPage.map.expectMapScreenshot(mapComponent, 'geoshape-initial-state.png');
 			await formPage.waitForNetworkIdle();
 			await formPage.map.scrollMapIntoView(mapComponent);
-			await formPage.map.longPressMap(mapComponent, 100, 100);
-			await formPage.map.longPressMap(mapComponent, 150, -50);
+			await formPage.map.tapToAddPoint(mapComponent, 100, 100);
+			await formPage.map.tapToAddPoint(mapComponent, 150, -50);
 			await formPage.map.expectMapScreenshot(mapComponent, 'geoshape-uncompleted-polygon.png');
-			await formPage.map.longPressMap(mapComponent, 50, -150);
+			await formPage.map.tapToAddPoint(mapComponent, 50, -150);
 			await formPage.map.expectMapScreenshot(mapComponent, 'geoshape-autoclose-polygon.png');
 		});
 	});
@@ -213,10 +213,10 @@ test.describe('All Question Types (Visual)', () => {
 			await formPage.map.expectMapScreenshot(mapComponent, 'geotrace-initial-state.png');
 			await formPage.waitForNetworkIdle();
 			await formPage.map.scrollMapIntoView(mapComponent);
-			await formPage.map.longPressMap(mapComponent, 100, 100);
-			await formPage.map.longPressMap(mapComponent, 150, -50);
+			await formPage.map.tapToAddPoint(mapComponent, 100, 100);
+			await formPage.map.tapToAddPoint(mapComponent, 150, -50);
 			await formPage.map.expectMapScreenshot(mapComponent, 'geotrace-two-points.png');
-			await formPage.map.longPressMap(mapComponent, 50, -75);
+			await formPage.map.tapToAddPoint(mapComponent, 50, -75);
 			await formPage.map.expectMapScreenshot(mapComponent, 'geoshape-three-points.png');
 		});
 	});
diff --git a/packages/web-forms/src/components/common/map/MapBlock.vue b/packages/web-forms/src/components/common/map/MapBlock.vue
index 3fb06aca7..73eecaf58 100644
--- a/packages/web-forms/src/components/common/map/MapBlock.vue
+++ b/packages/web-forms/src/components/common/map/MapBlock.vue
@@ -37,6 +37,7 @@ const isFullScreen = ref(false);
 const isAdvancedPanelOpen = ref(false);
 const confirmDeleteAction = ref(false);
 const isUpdateCoordsDialogOpen = ref(false);
+const pointPlaced = ref(false);
 const selectedVertex = ref<Coordinate | undefined>();
 const showErrorStyle = inject<ComputedRef<boolean>>(
 	QUESTION_HAS_ERROR,
@@ -46,7 +47,7 @@ const showErrorStyle = inject<ComputedRef<boolean>>(
 const mapHandler = useMapBlock(
 	{ mode: props.mode, singleFeatureType: props.singleFeatureType },
 	{
-		onFeaturePlacement: () => emitSavedFeature(),
+		onFeaturePlacement: () => onFeaturePlacement(),
 		onVertexSelect: (vertex) => (selectedVertex.value = vertex),
 	}
 );
@@ -98,6 +99,11 @@ watch(
 	(newValue) => mapHandler.setupMapInteractions(newValue)
 );
 
+const onFeaturePlacement = () => {
+	pointPlaced.value = true;
+	emitSavedFeature();
+};
+
 const handleEscapeKey = (event: KeyboardEvent) => {
 	if (event.key === 'Escape' && isFullScreen.value) {
 		isFullScreen.value = false;
@@ -175,15 +181,15 @@ const saveAdvancedPanelCoords = (newCoords: Coordinate) => {
 				/>
 
 				<Message
-					v-if="!disabled && mapHandler.canLongPressAndDrag()"
+					v-if="!disabled && mapHandler.canTapToAddAndDrag()"
 					severity="contrast"
 					closable
 					size="small"
 					:class="{ 'map-message': true, 'above-secondary-controls': showSecondaryControls }"
 				>
 					<!-- TODO: translations -->
-					<span v-if="savedFeatureValue">Press and drag to move a point</span>
-					<span v-else>Long press to place a point</span>
+					<span v-if="pointPlaced">Press and drag to move a point</span>
+					<span v-else>Tap to place a point</span>
 				</Message>
 			</div>
 
diff --git a/packages/web-forms/src/components/common/map/MapStatusBar.vue b/packages/web-forms/src/components/common/map/MapStatusBar.vue
index 24b3e402e..dab7abab3 100644
--- a/packages/web-forms/src/components/common/map/MapStatusBar.vue
+++ b/packages/web-forms/src/components/common/map/MapStatusBar.vue
@@ -133,6 +133,14 @@ const savedStatus = computed<StatusDetails | null>(() => {
 
 	return { message: 'Point saved', icon: 'mdiCheckCircle', highlight: true };
 });
+
+const displayState = computed(() => {
+	const baseState = savedStatus.value ?? noSavedStatus.value;
+	if (selectedVertexInfo.value.length) {
+		return { ...baseState, message: selectedVertexInfo.value };
+	}
+	return { ...baseState };
+});
 </script>
 
 <template>
@@ -145,16 +153,16 @@ const savedStatus = computed<StatusDetails | null>(() => {
 			</div>
 		</div>
 
-		<div v-else-if="savedStatus" class="map-status-container">
-			<div v-if="selectedVertexInfo.length" class="map-status">
-				<IconSVG :name="savedStatus.icon" :variant="savedStatus.highlight ? 'success' : 'base'" />
-				<span>{{ selectedVertexInfo }}</span>
-			</div>
-			<div v-else class="map-status">
-				<IconSVG :name="savedStatus.icon" :variant="savedStatus.highlight ? 'success' : 'base'" />
-				<span>{{ savedStatus.message }}</span>
+		<div class="map-status-container">
+			<div class="map-status">
+				<IconSVG
+					:name="displayState.icon"
+					:variant="displayState.highlight ? 'success' : 'base'"
+				/>
+				<span>{{ displayState.message }}</span>
 			</div>
-			<div class="map-status-buttons">
+
+			<div v-if="savedStatus" class="map-status-buttons">
 				<Button v-if="canRemove" outlined severity="contrast" @click="emit('discard')">
 					<span>–</span>
 					<!-- TODO: translations -->
@@ -168,14 +176,6 @@ const savedStatus = computed<StatusDetails | null>(() => {
 			</div>
 		</div>
 
-		<div v-else class="map-status-container">
-			<div class="map-status">
-				<IconSVG :name="noSavedStatus.icon" />
-				<!-- TODO: translations -->
-				<span>{{ noSavedStatus.message }}</span>
-			</div>
-		</div>
-
 		<Button
 			v-if="canOpenAdvancedPanel"
 			class="advanced-button"
diff --git a/packages/web-forms/src/components/common/map/getModeConfig.ts b/packages/web-forms/src/components/common/map/getModeConfig.ts
index 29cb6e5a1..a293b3bcf 100644
--- a/packages/web-forms/src/components/common/map/getModeConfig.ts
+++ b/packages/web-forms/src/components/common/map/getModeConfig.ts
@@ -36,7 +36,7 @@ export interface ModeCapabilities {
 interface ModeConfig {
 	interactions: {
 		select: boolean;
-		longPress: boolean;
+		tapToAdd: boolean;
 		dragFeature: boolean;
 		dragFeatureAndVertex: boolean;
 	};
@@ -48,7 +48,7 @@ export const getModeConfig = (mode: Mode): ModeConfig => {
 	const defaultConfig = {
 		interactions: {
 			select: false,
-			longPress: false,
+			tapToAdd: false,
 			dragFeature: false,
 			dragFeatureAndVertex: false,
 		},
@@ -98,7 +98,7 @@ export const getModeConfig = (mode: Mode): ModeConfig => {
 		return {
 			interactions: {
 				...defaultConfig.interactions,
-				longPress: true,
+				tapToAdd: true,
 				dragFeature: true,
 			},
 			capabilities: {
@@ -115,7 +115,7 @@ export const getModeConfig = (mode: Mode): ModeConfig => {
 			interactions: {
 				...defaultConfig.interactions,
 				select: true,
-				longPress: true,
+				tapToAdd: true,
 				dragFeatureAndVertex: true,
 			},
 			capabilities: {
diff --git a/packages/web-forms/src/components/common/map/useMapBlock.ts b/packages/web-forms/src/components/common/map/useMapBlock.ts
index d05c0b8ee..6e16a7c0c 100644
--- a/packages/web-forms/src/components/common/map/useMapBlock.ts
+++ b/packages/web-forms/src/components/common/map/useMapBlock.ts
@@ -38,12 +38,13 @@ import {
 	getVertexByIndex,
 	updateVertexCoordinate,
 } from '@/components/common/map/vertex-geometry.ts';
-import type { FeatureCollection, Feature as GeoJsonFeature } from 'geojson';
+import type { Feature as GeoJsonFeature, FeatureCollection } from 'geojson';
 import { Map, View } from 'ol';
 import { Attribution, Zoom } from 'ol/control';
 import type { Coordinate } from 'ol/coordinate';
 import Feature from 'ol/Feature';
 import { LineString, Polygon, SimpleGeometry } from 'ol/geom';
+import { defaults as defaultInteractions } from 'ol/interaction';
 import TileLayer from 'ol/layer/Tile';
 import VectorLayer from 'ol/layer/Vector';
 import WebGLVectorLayer from 'ol/layer/WebGLVector';
@@ -133,6 +134,7 @@ export function useMapBlock(config: MapBlockConfig, events: MapBlockEvents) {
 				extent: getProjection(DEFAULT_VIEW_PROJECTION)?.getExtent(),
 			}),
 			controls: [new Zoom(), new Attribution({ collapsible: false })],
+			interactions: defaultInteractions({ doubleClickZoom: false }),
 		});
 
 		mapViewControls = useMapViewControls(mapInstance);
@@ -199,8 +201,8 @@ export function useMapBlock(config: MapBlockConfig, events: MapBlockEvents) {
 			);
 		}
 
-		if (currentMode.interactions.longPress) {
-			mapInteractions.setupLongPressPoint(featuresSource, (feature) =>
+		if (currentMode.interactions.tapToAdd) {
+			mapInteractions.setupTapToAddVertex(featuresSource, (feature) =>
 				handlePointPlacement(feature)
 			);
 
@@ -468,9 +470,9 @@ export function useMapBlock(config: MapBlockConfig, events: MapBlockEvents) {
 		return currentMode.capabilities.canRemoveCurrentLocation && !!mapFeatures?.getSavedFeature();
 	};
 
-	const canLongPressAndDrag = () => {
-		const { longPress, dragFeature, dragFeatureAndVertex } = currentMode.interactions;
-		return longPress && (dragFeature || dragFeatureAndVertex);
+	const canTapToAddAndDrag = () => {
+		const { tapToAdd, dragFeature, dragFeatureAndVertex } = currentMode.interactions;
+		return tapToAdd && (dragFeature || dragFeatureAndVertex);
 	};
 
 	const canOpenAdvancedPanel = () => {
@@ -554,7 +556,7 @@ export function useMapBlock(config: MapBlockConfig, events: MapBlockEvents) {
 		selectSavedFeature: () => mapFeatures?.selectFeature(mapFeatures?.getSavedFeature()),
 		unselectFeature,
 
-		canLongPressAndDrag,
+		canTapToAddAndDrag,
 		canViewProperties: () => currentMode.capabilities.canViewProperties,
 		canOpenAdvancedPanel,
 		shouldShowMapOverlay,
diff --git a/packages/web-forms/src/components/common/map/useMapFeatures.ts b/packages/web-forms/src/components/common/map/useMapFeatures.ts
index d6da7082a..7d19670fa 100644
--- a/packages/web-forms/src/components/common/map/useMapFeatures.ts
+++ b/packages/web-forms/src/components/common/map/useMapFeatures.ts
@@ -118,6 +118,7 @@ export function useMapFeatures(
 	const selectFeature = (feature: Feature | undefined, vertexIndex?: number) => {
 		if (capabilities.canSelectFeatureOrVertex) {
 			selectedFeature.value?.set(IS_SELECTED_PROPERTY, false);
+			selectedFeature.value?.set(SELECTED_VERTEX_INDEX_PROPERTY, undefined);
 			feature?.set(SELECTED_VERTEX_INDEX_PROPERTY, vertexIndex);
 			feature?.set(IS_SELECTED_PROPERTY, true);
 		}
diff --git a/packages/web-forms/src/components/common/map/useMapInteractions.ts b/packages/web-forms/src/components/common/map/useMapInteractions.ts
index 88ce820b0..dc46fc0f7 100644
--- a/packages/web-forms/src/components/common/map/useMapInteractions.ts
+++ b/packages/web-forms/src/components/common/map/useMapInteractions.ts
@@ -13,14 +13,14 @@ import {
 	addTraceVertex,
 	getFlatCoordinates,
 	getVertexIndex,
+	isNearVertex,
+	isOnFeatureEdge,
 } from '@/components/common/map/vertex-geometry.ts';
-import type { TimerID } from '@getodk/common/types/timers.ts';
 import { Collection, Map, MapBrowserEvent } from 'ol';
 import type { Coordinate } from 'ol/coordinate';
 import Feature from 'ol/Feature';
 import { LineString, Point, Polygon } from 'ol/geom';
 import { Modify, Translate } from 'ol/interaction';
-import PointerInteraction from 'ol/interaction/Pointer';
 import VectorLayer from 'ol/layer/Vector';
 import WebGLVectorLayer from 'ol/layer/WebGLVector';
 import type { Pixel } from 'ol/pixel';
@@ -33,7 +33,7 @@ export interface UseMapInteractions {
 	removeMapInteractions: () => void;
 	pushUndoState: (feature: Feature | null) => void;
 	setupFeatureDrag: (layer: VectorLayer, onDrag: (feature: Feature) => void) => void;
-	setupLongPressPoint: (source: VectorSource, onLongPress: (feature: Feature) => void) => void;
+	setupTapToAddVertex: (source: VectorSource, onAdd: (feature: Feature) => void) => void;
 	setupMapVisibilityObserver: (mapContainer: HTMLElement, onMapNotVisible: () => void) => void;
 	setupVertexDrag: (source: VectorSource, onDrag: (feature: Feature) => void) => void;
 	teardownMap: () => void;
@@ -43,8 +43,7 @@ export interface UseMapInteractions {
 	) => void;
 }
 
-const LONG_PRESS_TIME = 1300;
-const LONG_PRESS_HIT_TOLERANCE = 20;
+const ADD_VERTEX_HIT_TOLERANCE = 20;
 const SELECT_HIT_TOLERANCE = 15;
 
 export function useMapInteractions(
@@ -53,11 +52,18 @@ export function useMapInteractions(
 	singleFeatureType: SingleFeatureType | undefined
 ): UseMapInteractions {
 	const currentLocationObserver = shallowRef<IntersectionObserver | undefined>();
-	const pointerInteraction = shallowRef<PointerInteraction | undefined>();
+	const tapListener = shallowRef<((event: MapBrowserEvent) => void) | undefined>();
 	const translateInteraction = shallowRef<Translate | undefined>();
 	const modifyInteraction = shallowRef<Modify | undefined>();
 	const undoStack = shallowRef<Array<Feature | null>>([]);
 
+	const getVectorFeaturesAtPixel = (pixel: Pixel) => {
+		return mapInstance.getFeaturesAtPixel(pixel, {
+			layerFilter: (layer) => layer instanceof VectorLayer,
+			hitTolerance: SELECT_HIT_TOLERANCE,
+		});
+	};
+
 	const setupMapVisibilityObserver = (mapContainer: HTMLElement, onMapNotVisible: () => void) => {
 		if ('IntersectionObserver' in window) {
 			currentLocationObserver.value = new IntersectionObserver(
@@ -74,7 +80,7 @@ export function useMapInteractions(
 
 	const removeMapInteractions = () => {
 		toggleSelectEvent(false);
-		removeLongPressPoint();
+		removeTapToAddVertex();
 		removeFeatureDrag();
 		removePhantomMiddlePoint();
 	};
@@ -110,30 +116,34 @@ export function useMapInteractions(
 		event: MapBrowserEvent,
 		onSelect: (feature: Feature | undefined, selectedVertexIndex: number | undefined) => void
 	): void => {
-		const hitFeatures = mapInstance.getFeaturesAtPixel(event.pixel, {
-			layerFilter: (layer) => layer instanceof VectorLayer,
-			hitTolerance: SELECT_HIT_TOLERANCE,
-		});
-
-		const selectedFeature = hitFeatures?.find((item) => {
+		const hitFeatures = getVectorFeaturesAtPixel(event.pixel);
+		const targetFeature = hitFeatures?.find((item) => {
 			const geometry = item.getGeometry();
 			return geometry instanceof Polygon || geometry instanceof LineString;
 		}) as Feature<LineString | Polygon> | undefined;
 
-		if (!selectedFeature) {
+		if (!targetFeature) {
 			onSelect?.(undefined, undefined);
 			return;
 		}
 
-		const coords = getFlatCoordinates(selectedFeature.getGeometry());
-		if (coords.length === 1) {
-			onSelect?.(selectedFeature, 0);
-			return;
-		}
+		const hitVertexGeometry = hitFeatures.find((item) => {
+			return item.getGeometry() instanceof Point; // Vertex geometry is always a Point
+		}) as Feature<Point> | undefined;
+		const hasOneVertex = getFlatCoordinates(targetFeature.getGeometry()).length === 1;
+		const hitVertexIndex = hasOneVertex ? 0 : getVertexIndex(targetFeature, hitVertexGeometry);
+
+		const currentSelectedVertex = targetFeature.get(SELECTED_VERTEX_INDEX_PROPERTY) as number;
+		const isSameSelectedVertex = hitVertexIndex != null && currentSelectedVertex === hitVertexIndex;
 
-		const vertexToSelect = hitFeatures.find((item) => item.getGeometry() instanceof Point);
-		const index = getVertexIndex(selectedFeature, vertexToSelect as Feature<Point> | undefined);
-		onSelect?.(selectedFeature, index);
+		const isFeatureSelected = !!targetFeature.get(IS_SELECTED_PROPERTY);
+		const isInsideFeature = hitVertexIndex == null && isFeatureSelected;
+
+		if (isSameSelectedVertex || isInsideFeature) {
+			onSelect?.(undefined, undefined);
+		} else {
+			onSelect?.(targetFeature, hitVertexIndex);
+		}
 	};
 
 	const toggleSelectEvent = (
@@ -163,107 +173,76 @@ export function useMapInteractions(
 		}
 	};
 
-	const resolveFeatureForLongPress = (
+	const resolveFeatureForTapToAdd = (
 		coordinate: Coordinate,
 		resolution: number,
 		feature: Feature | undefined
 	) => {
 		if (singleFeatureType === SINGLE_FEATURE_TYPES.SHAPE) {
-			return addShapeVertex(resolution, coordinate, feature, LONG_PRESS_HIT_TOLERANCE);
+			return addShapeVertex(resolution, coordinate, feature, ADD_VERTEX_HIT_TOLERANCE);
 		}
 
 		if (singleFeatureType === SINGLE_FEATURE_TYPES.TRACE) {
-			return addTraceVertex(resolution, coordinate, feature, LONG_PRESS_HIT_TOLERANCE);
+			return addTraceVertex(resolution, coordinate, feature, ADD_VERTEX_HIT_TOLERANCE);
 		}
 
 		return new Feature({ geometry: new Point(coordinate) });
 	};
 
-	const addVertexOnLongPress = (
-		source: VectorSource,
-		coordinate: Coordinate,
-		onLongPress: (feature: Feature) => void
-	) => {
-		const resolution = mapInstance.getView().getResolution() ?? 1;
-		const feature = source.getFeatures()?.[0];
-		pushUndoState(feature ?? null);
-		const updatedFeature = resolveFeatureForLongPress(coordinate, resolution, feature)!;
-
-		if (singleFeatureType === SINGLE_FEATURE_TYPES.POINT && !source.isEmpty()) {
-			source.clear(true);
-		}
+	const preventContextMenu = (e: Event) => e.preventDefault();
 
-		if (source.isEmpty()) {
-			source.addFeature(updatedFeature);
+	const setupTapToAddVertex = (source: VectorSource, onAdd: (feature: Feature) => void) => {
+		if (tapListener.value) {
+			return;
 		}
 
-		onLongPress(updatedFeature);
-	};
+		const listener = (event: MapBrowserEvent) => {
+			if (event.dragging) {
+				return;
+			}
 
-	const isPressInHitTolerance = (pixel: number[] | undefined, startPixel: Pixel | null) => {
-		if (!startPixel?.length || !pixel || pixel.length < 2) {
-			return false;
-		}
+			const eventCoords = event.coordinate;
+			const resolution = mapInstance.getView().getResolution() ?? 1;
+			const hitFeatures = getVectorFeaturesAtPixel(event.pixel);
+			const targetFeature = hitFeatures.find((f) => source.hasFeature(f as Feature)) as
+				| Feature
+				| undefined;
 
-		const [eventX, eventY] = pixel as [number, number];
-		const [startX, startY] = startPixel as [number, number];
-		const distanceX = Math.abs(eventX - startX);
-		const distanceY = Math.abs(eventY - startY);
+			if (targetFeature) {
+				if (isNearVertex(targetFeature, eventCoords, resolution, ADD_VERTEX_HIT_TOLERANCE)) {
+					return;
+				}
 
-		return distanceX <= LONG_PRESS_HIT_TOLERANCE && distanceY <= LONG_PRESS_HIT_TOLERANCE;
-	};
+				if (!isOnFeatureEdge(targetFeature, eventCoords, resolution, ADD_VERTEX_HIT_TOLERANCE)) {
+					return;
+				}
+			}
 
-	const preventContextMenu = (e: Event) => e.preventDefault();
+			const feature = source.getFeatures()?.[0];
+			pushUndoState(feature ?? null);
+			const updatedFeature = resolveFeatureForTapToAdd(eventCoords, resolution, feature)!;
 
-	const setupLongPressPoint = (source: VectorSource, onLongPress: (feature: Feature) => void) => {
-		if (pointerInteraction.value) {
-			return;
-		}
+			if (singleFeatureType === SINGLE_FEATURE_TYPES.POINT && !source.isEmpty()) {
+				source.clear(true);
+			}
 
-		const viewport = mapInstance.getViewport();
-		let timer: TimerID | undefined;
-		let startPixel: Pixel | null = null;
-		const upListener = () => clearAndRemoveListeners();
-		const moveListener = (moveEvent: MapBrowserEvent) => {
-			if (!startPixel || !isPressInHitTolerance(moveEvent.pixel, startPixel)) {
-				clearAndRemoveListeners();
+			if (source.isEmpty()) {
+				source.addFeature(updatedFeature);
 			}
-		};
-		const clearAndRemoveListeners = () => {
-			clearTimeout(timer);
-			timer = undefined;
-			startPixel = null;
-			mapInstance.un('pointermove', moveListener);
-			viewport.removeEventListener('pointerup', upListener);
-		};
 
-		pointerInteraction.value = new PointerInteraction({
-			handleDownEvent: (event) => {
-				if (timer) {
-					clearAndRemoveListeners();
-					return false;
-				}
-				startPixel = event.pixel;
-				setCursor('pointer');
-				mapInstance.on('pointermove', moveListener);
-				viewport.addEventListener('pointerup', upListener);
-
-				timer = setTimeout(() => {
-					clearAndRemoveListeners();
-					addVertexOnLongPress(source, event.coordinate, onLongPress);
-				}, LONG_PRESS_TIME);
-				return false;
-			},
-		});
+			onAdd(updatedFeature);
+		};
 
-		mapInstance.addInteraction(pointerInteraction.value);
-		viewport.addEventListener('contextmenu', preventContextMenu);
+		tapListener.value = listener;
+		mapInstance.on('click', listener);
+		mapInstance.getViewport().addEventListener('contextmenu', preventContextMenu);
 	};
 
-	const removeLongPressPoint = () => {
-		if (pointerInteraction.value) {
-			mapInstance.removeInteraction(pointerInteraction.value);
-			pointerInteraction.value = undefined;
+	const removeTapToAddVertex = () => {
+		if (tapListener.value) {
+			mapInstance.un('click', tapListener.value);
+			tapListener.value = undefined;
+			setCursor('default');
 		}
 	};
 
@@ -364,7 +343,7 @@ export function useMapInteractions(
 		removeMapInteractions,
 		pushUndoState,
 		setupFeatureDrag,
-		setupLongPressPoint,
+		setupTapToAddVertex,
 		setupMapVisibilityObserver,
 		setupVertexDrag,
 		teardownMap,
diff --git a/packages/web-forms/src/components/common/map/vertex-geometry.ts b/packages/web-forms/src/components/common/map/vertex-geometry.ts
index 07a863b4e..1a822a046 100644
--- a/packages/web-forms/src/components/common/map/vertex-geometry.ts
+++ b/packages/web-forms/src/components/common/map/vertex-geometry.ts
@@ -92,6 +92,48 @@ const isOnLine = (squaredDist: number, resolution: number, hitTolerance: number)
 	return squaredDist <= tolerance ** 2;
 };
 
+export const isNearVertex = (
+	feature: Feature | undefined,
+	point: Coordinate,
+	resolution: number,
+	hitTolerance: number
+): boolean => {
+	const geometry = feature?.getGeometry();
+	if (!geometry || (!(geometry instanceof LineString) && !(geometry instanceof Polygon))) {
+		return false;
+	}
+
+	return getFlatCoordinates(geometry).some((vertex) => {
+		const { deltaX, deltaY } = getDeltaBetweenPoints(point, vertex);
+		const squaredDist = getDistanceBetweenPoints(deltaX, deltaY);
+		return isOnLine(squaredDist, resolution, hitTolerance);
+	});
+};
+
+export const isOnFeatureEdge = (
+	feature: Feature | undefined,
+	point: Coordinate,
+	resolution: number,
+	hitTolerance: number
+): boolean => {
+	const geometry = feature?.getGeometry();
+	if (geometry instanceof LineString) {
+		return true;
+	}
+
+	if (geometry instanceof Polygon) {
+		const ring = getFlatCoordinates(geometry);
+		if (ring.length < 2) {
+			return false;
+		}
+
+		const { squaredDist } = getClosestSegmentAndIndex(ring, point);
+		return isOnLine(squaredDist, resolution, hitTolerance);
+	}
+
+	return false;
+};
+
 export const addTraceVertex = (
 	resolution: number,
 	newVertex: Coordinate,
diff --git a/packages/web-forms/tests/components/common/map/getModeConfig.test.ts b/packages/web-forms/tests/components/common/map/getModeConfig.test.ts
index 98c65bf24..f03b43a3f 100644
--- a/packages/web-forms/tests/components/common/map/getModeConfig.test.ts
+++ b/packages/web-forms/tests/components/common/map/getModeConfig.test.ts
@@ -8,7 +8,7 @@ describe('getModeConfig', () => {
 		expect(config).toEqual({
 			interactions: {
 				select: true,
-				longPress: false,
+				tapToAdd: false,
 				dragFeature: false,
 				dragFeatureAndVertex: false,
 			},
@@ -34,7 +34,7 @@ describe('getModeConfig', () => {
 		expect(config).toEqual({
 			interactions: {
 				select: false,
-				longPress: false,
+				tapToAdd: false,
 				dragFeature: false,
 				dragFeatureAndVertex: false,
 			},
@@ -60,7 +60,7 @@ describe('getModeConfig', () => {
 		expect(config).toEqual({
 			interactions: {
 				select: false,
-				longPress: true,
+				tapToAdd: true,
 				dragFeature: true,
 				dragFeatureAndVertex: false,
 			},
@@ -86,7 +86,7 @@ describe('getModeConfig', () => {
 		expect(config).toEqual({
 			interactions: {
 				select: true,
-				longPress: true,
+				tapToAdd: true,
 				dragFeature: false,
 				dragFeatureAndVertex: true,
 			},
@@ -113,7 +113,7 @@ describe('getModeConfig', () => {
 		expect(config).toEqual({
 			interactions: {
 				select: false,
-				longPress: false,
+				tapToAdd: false,
 				dragFeature: false,
 				dragFeatureAndVertex: false,
 			},