diff --git a/CHANGELOG.md b/CHANGELOG.md
index c204559a2..ab90c57a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
* Prevent password managers from autofilling tag fields ([#10508], thanks [@michaelabon])
#### :scissors: Operations
* When extracting a node from a way (shortcut: E), the relations are now preserved by default. Extracting a node without its relations is still possible using ⇧ Shift E ([#9816], thanks [@k-yle])
+* Remove rarely-used keyboard shortcut L to prevent accidental activation of the geolocate tool ([#9999], thanks [@k-yle])
#### :camera: Street-Level
#### :white_check_mark: Validation
#### :bug: Bugfixes
@@ -67,6 +68,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
[#9013]: https://github.com/openstreetmap/iD/issues/9013
[#9816]: https://github.com/openstreetmap/iD/issues/9816
+[#9999]: https://github.com/openstreetmap/iD/issues/9999
[#10452]: https://github.com/openstreetmap/iD/pull/10452
[#10459]: https://github.com/openstreetmap/iD/pull/10459
[#10488]: https://github.com/openstreetmap/iD/pull/10488
diff --git a/data/core.yaml b/data/core.yaml
index cff0346c8..b83ce77e6 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -692,7 +692,6 @@ en:
search: Search worldwide...
no_results_worldwide: No results found
geolocate:
- key: L
title: Show My Location
locating: "Locating, please wait..."
location_unavailable: Your location is unavailable.
@@ -2357,7 +2356,6 @@ en:
pan_more: "Pan map by one screenful"
zoom: "Zoom in / Zoom out"
zoom_more: "Zoom in / Zoom out by a lot"
- geolocate: "Zoom to my location"
help:
title: "Help"
help: "Show help/documentation"
diff --git a/data/shortcuts.json b/data/shortcuts.json
index 233078b57..f5402fd72 100644
--- a/data/shortcuts.json
+++ b/data/shortcuts.json
@@ -31,10 +31,6 @@
"text": "shortcuts.browsing.navigation.zoom_more",
"separator": ","
},
- {
- "shortcuts": ["geolocate.key"],
- "text": "shortcuts.browsing.navigation.geolocate"
- },
{
"section": "display_options",
"text": "shortcuts.browsing.display_options.title"
diff --git a/modules/ui/geolocate.js b/modules/ui/geolocate.js
index 67c359592..0438aa2fa 100644
--- a/modules/ui/geolocate.js
+++ b/modules/ui/geolocate.js
@@ -91,9 +91,6 @@ export function uiGeolocate(context) {
.call(uiTooltip()
.placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
.title(() => t.append('geolocate.title'))
- .keys([t('geolocate.key')])
);
-
- context.keybinding().on(t('geolocate.key'), click);
};
}