diff --git a/configurator/CHANGELOG.md b/configurator/CHANGELOG.md
index 321906b..66aa870 100644
--- a/configurator/CHANGELOG.md
+++ b/configurator/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.2.0
+
+- Add git option which allows disabling the (default) git initialization
+
 ## 5.1.0
 
 - Update base image to Alpine 3.12
diff --git a/configurator/DOCS.md b/configurator/DOCS.md
index 4a237e9..2fea440 100644
--- a/configurator/DOCS.md
+++ b/configurator/DOCS.md
@@ -24,6 +24,7 @@ Add-on configuration:
 ```yaml
 dirsfirst: false
 enforce_basepath: false
+git: true
 ignore_pattern:
   - __pycache__
 ssh_keys: []
@@ -39,6 +40,10 @@ Set it to `true` to list directories first, `false` otherwise.
 
 If set to `true`, access is limited to files within the `/config` directory.
 
+### Option: `git` (required)
+
+If set to `true`, add-on will initialize git for directories which support it.
+
 ### Option: `ignore_pattern` (required)
 
 This option allows you to hide files and folders from the file browser tree.
diff --git a/configurator/config.json b/configurator/config.json
index 6cbeb39..d71a294 100644
--- a/configurator/config.json
+++ b/configurator/config.json
@@ -1,6 +1,6 @@
 {
   "name": "File editor",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "slug": "configurator",
   "description": "Simple browser-based file editor for Home Assistant",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/configurator",
@@ -16,12 +16,14 @@
   "options": {
     "dirsfirst": false,
     "enforce_basepath": true,
+    "git": true,
     "ignore_pattern": ["__pycache__", ".cloud", ".storage", "deps"],
     "ssh_keys": []
   },
   "schema": {
     "dirsfirst": "bool",
     "enforce_basepath": "bool",
+    "git": "bool",
     "ignore_pattern": ["str"],
     "ssh_keys": ["str"]
   },
diff --git a/configurator/rootfs/etc/services.d/configurator/run b/configurator/rootfs/etc/services.d/configurator/run
index c239c91..7cd5107 100644
--- a/configurator/rootfs/etc/services.d/configurator/run
+++ b/configurator/rootfs/etc/services.d/configurator/run
@@ -4,6 +4,7 @@
 # ==============================================================================
 export HC_DIRSFIRST
 export HC_ENFORCE_BASEPATH
+export HC_GIT
 export HC_HASS_API_PASSWORD
 export HC_IGNORE_PATTERN
 
@@ -27,6 +28,7 @@ fi
 # Setup and run configurator
 HC_DIRSFIRST=$(bashio::config 'dirsfirst')
 HC_ENFORCE_BASEPATH=$(bashio::config 'enforce_basepath')
+HC_GIT=$(bashio::config 'git')
 HC_HASS_API_PASSWORD="${SUPERVISOR_TOKEN}"
 HC_IGNORE_PATTERN="$(bashio::config 'ignore_pattern | join(",")')"