diff --git a/.gitignore b/.gitignore
index 5e964069..23aaa8c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -318,7 +318,7 @@ CMakeLists.txt.user*
 *.bak
 
 # visual studio code
-.vscode/
+#.vscode/
 
 # markdown temp files
 *.md.Html
diff --git a/src/ui/flutter_app/.gitignore b/src/ui/flutter_app/.gitignore
index aefa45e8..f7cda2ec 100644
--- a/src/ui/flutter_app/.gitignore
+++ b/src/ui/flutter_app/.gitignore
@@ -18,7 +18,7 @@
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-.vscode/
+#.vscode/
 
 # Visual Studio
 .vs/
diff --git a/src/ui/flutter_app/.vscode/settings.json b/src/ui/flutter_app/.vscode/settings.json
new file mode 100644
index 00000000..0c971f59
--- /dev/null
+++ b/src/ui/flutter_app/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+  "[dart]": {
+    "editor.formatOnSave": true
+  }
+}
\ No newline at end of file