diff --git a/platformio/ide/tpls/atom/.gitignore.tpl b/platformio/ide/tpls/atom/.gitignore.tpl
index 5dac9f52..f1520281 100644
--- a/platformio/ide/tpls/atom/.gitignore.tpl
+++ b/platformio/ide/tpls/atom/.gitignore.tpl
@@ -1,3 +1,4 @@
+.pio
 .pioenvs
 .piolibdeps
 .clang_complete
diff --git a/platformio/ide/tpls/clion/.gitignore.tpl b/platformio/ide/tpls/clion/.gitignore.tpl
index 081bde01..4c5921e1 100644
--- a/platformio/ide/tpls/clion/.gitignore.tpl
+++ b/platformio/ide/tpls/clion/.gitignore.tpl
@@ -1,3 +1,4 @@
+.pio
 .pioenvs
 .piolibdeps
 CMakeListsPrivate.txt
diff --git a/platformio/ide/tpls/clion/.idea/misc.xml.tpl b/platformio/ide/tpls/clion/.idea/misc.xml.tpl
index 2b0c16ca..9b483ee6 100644
--- a/platformio/ide/tpls/clion/.idea/misc.xml.tpl
+++ b/platformio/ide/tpls/clion/.idea/misc.xml.tpl
@@ -9,6 +9,9 @@
       <file path="$PROJECT_DIR$/lib" />
       <file path="$PROJECT_DIR$/.piolibdeps" />
     </libraryRoots>
+    <excludeRoots>
+      <file path="$PROJECT_DIR$/.pio" />
+    </excludeRoots>
     <excludeRoots>
       <file path="$PROJECT_DIR$/.pioenvs" />
     </excludeRoots>
diff --git a/platformio/ide/tpls/emacs/.gitignore.tpl b/platformio/ide/tpls/emacs/.gitignore.tpl
index 18d8a15b..2c3fccfb 100644
--- a/platformio/ide/tpls/emacs/.gitignore.tpl
+++ b/platformio/ide/tpls/emacs/.gitignore.tpl
@@ -1,3 +1,4 @@
+.pio
 .pioenvs
 .piolibdeps
 .clang_complete
diff --git a/platformio/ide/tpls/netbeans/nbproject/configurations.xml.tpl b/platformio/ide/tpls/netbeans/nbproject/configurations.xml.tpl
index 897d7451..7c43f565 100644
--- a/platformio/ide/tpls/netbeans/nbproject/configurations.xml.tpl
+++ b/platformio/ide/tpls/netbeans/nbproject/configurations.xml.tpl
@@ -11,7 +11,7 @@
       <itemPath>nbproject/private/launcher.properties</itemPath>
     </logicalFolder>
   </logicalFolder>
-  <sourceFolderFilter>^(nbproject|.pioenvs)$</sourceFolderFilter>
+  <sourceFolderFilter>^(nbproject|.pio|.pioenvs)$</sourceFolderFilter>
   <sourceRootList>
     <Elem>.</Elem>
   </sourceRootList>
diff --git a/platformio/ide/tpls/vim/.gitignore.tpl b/platformio/ide/tpls/vim/.gitignore.tpl
index 5dac9f52..f1520281 100644
--- a/platformio/ide/tpls/vim/.gitignore.tpl
+++ b/platformio/ide/tpls/vim/.gitignore.tpl
@@ -1,3 +1,4 @@
+.pio
 .pioenvs
 .piolibdeps
 .clang_complete
diff --git a/platformio/ide/tpls/vscode/.gitignore.tpl b/platformio/ide/tpls/vscode/.gitignore.tpl
index 6a010304..2de98aba 100644
--- a/platformio/ide/tpls/vscode/.gitignore.tpl
+++ b/platformio/ide/tpls/vscode/.gitignore.tpl
@@ -1,3 +1,4 @@
+.pio
 .pioenvs
 .piolibdeps
 .vscode/.browse.c_cpp.db*