diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8215bff5a..b0ae67d1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 * Tag keys of a multi-selection can now also be changed in the tags editor when the tag values differ in the selected features. ([#8836])
 * Improve screen reader accessibility ([#8835], thanks [@mbrzakovic])
 * Render footways, cycleways, bridleways, paths and steps which are under construction (or proposed) thinner than generic roads under construction ([#8743], thanks [@k-yle])
+* Only show accepted file types in custom data file chooser ([#8676], thanks [@jtracey])
 #### :scissors: Operations
 * Split operation now indicates more clearly when multiple ways will be affected and gives a hint how to restrict the operation to a single line ([#8818])
 * Many operations now better preserve OSM object history ([#8839], thanks [@tpetillon])
@@ -86,6 +87,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 
 [#8057]: https://github.com/openstreetmap/iD/issues/8057
 [#8519]: https://github.com/openstreetmap/iD/issues/8519
+[#8676]: https://github.com/openstreetmap/iD/issues/8676
 [#8743]: https://github.com/openstreetmap/iD/issues/8743
 [#8764]: https://github.com/openstreetmap/iD/pull/8764
 [#8771]: https://github.com/openstreetmap/iD/issues/8771
@@ -116,6 +118,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
 [@mbrzakovic]: https://github.com/mbrzakovic
 [@wvanderp]: https://github.com/wvanderp
 [@hodigabi]: https://github.com/hodigabi
+[@jtracey]: https://github.com/jtracey
 
 # 2.20.2
 ##### 2021-Oct-28
diff --git a/modules/ui/settings/custom_data.js b/modules/ui/settings/custom_data.js
index 956502fd9..237a10a4e 100644
--- a/modules/ui/settings/custom_data.js
+++ b/modules/ui/settings/custom_data.js
@@ -44,6 +44,7 @@ export function uiSettingsCustomData(context) {
             .append('input')
             .attr('class', 'field-file')
             .attr('type', 'file')
+            .attr('accept', '.gpx,.kml,.geojson,.json,application/gpx+xml,application/vnd.google-earth.kml+xml,application/geo+json,application/json')
             .property('files', _currSettings.fileList)  // works for all except IE11
             .on('change', function(d3_event) {
                 var files = d3_event.target.files;