diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 4808a56d8e..49e602fab1 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1060,6 +1060,9 @@ au BufNewFile,BufRead *.json5			setf json5
 " JSON Patch (RFC 6902)
 au BufNewFile,BufRead *.json-patch		setf json
 
+" Geojson is also json
+au BufNewFile,BufRead *.geojson			setf json
+
 " Jupyter Notebook is also json
 au BufNewFile,BufRead *.ipynb			setf json
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 7125360da1..25bfdeb004 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -340,7 +340,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     jq: ['file.jq'],
     jovial: ['file.jov', 'file.j73', 'file.jovial'],
     jproperties: ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
-    json: ['file.json', 'file.jsonp', 'file.json-patch', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf'],
+    json: ['file.json', 'file.jsonp', 'file.json-patch', 'file.geojson', 'file.webmanifest', 'Pipfile.lock', 'file.ipynb', '.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf'],
     json5: ['file.json5'],
     jsonc: ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json', 'tsconfig-test.json'],
     jsonl: ['file.jsonl'],