diff --git a/assets/settings/default.json b/assets/settings/default.json
index 4288c9be71..56af0f2e76 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -548,12 +548,12 @@
   },
   // Configuration for how direnv configuration should be loaded. May take 2 values:
   // 1. Load direnv configuration through the shell hook, works for POSIX shells and fish.
-  //      "direnv": "shell_hook"
+  //      "load_direnv": "shell_hook"
   // 2. Load direnv configuration using `direnv export json` directly.
   //    This can help with some shells that otherwise would not detect
   //    the direnv environment, such as nushell or elvish.
-  //      "direnv": "direct"
-  "direnv": "shell_hook",
+  //      "load_direnv": "direct"
+  "load_direnv": "shell_hook",
   "inline_completions": {
     // A list of globs representing files that inline completions should be disabled for.
     "disabled_globs": [".env"]
diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md
index ff2c299328..dd95993cbb 100644
--- a/docs/src/configuring-zed.md
+++ b/docs/src/configuring-zed.md
@@ -193,11 +193,11 @@ left and right padding of the central pane from the workspace when the centered
 ## Direnv Integration
 
 - Description: Settings for [direnv](https://direnv.net/) integration. Requires `direnv` to be installed. `direnv` integration currently only means that the environment variables set by a `direnv` configuration can be used to detect some language servers in `$PATH` instead of installing them.
-- Setting: `direnv`
+- Setting: `load_direnv`
 - Default:
 
 ```json
-"direnv": "shell_hook"
+"load_direnv": "shell_hook"
 ```
 
 **Options**