diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a27fe99b0..6979f8569 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,6 +3,9 @@
 	"name": "Hass.io dev",
 	"context": "..",
 	"dockerFile": "Dockerfile",
+	"runArgs": [
+		"-e", "GIT_EDTIOR='code --wait'"
+	],
 	"extensions": [
 		"ms-python.python"
 	],
@@ -13,6 +16,7 @@
 		"python.formatting.provider": "black",
 		"editor.formatOnPaste": false,
 		"editor.formatOnSave": true,
-		"editor.formatOnType": true
+		"editor.formatOnType": true,
+		"files.trimTrailingWhitespace": true
 	}
-}
\ No newline at end of file
+}