diff --git a/HISTORY.rst b/HISTORY.rst
index 144744df..f4159d22 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -13,6 +13,7 @@ PlatformIO Core 5
 
 - Improved support for projects located on a network share (`issue #3417 <https://github.com/platformio/platformio-core/issues/3417>`_, `issue #3926 <https://github.com/platformio/platformio-core/issues/3926>`_, `issue #4099 <https://github.com/platformio/platformio-core/issues/4099>`_)
 - Fixed an issue with the CLion project generator when a macro contains a space (`issue #4102 <https://github.com/platformio/platformio-core/issues/4102>`_)
+- Fixed an issue with the NetBeans project generator when the path to PlatformIO contains a space (`issue #4096 <https://github.com/platformio/platformio-core/issues/4096>`_)
 
 5.2.3 (2021-11-05)
 ~~~~~~~~~~~~~~~~~~
diff --git a/platformio/project/tpls/netbeans/nbproject/configurations.xml.tpl b/platformio/project/tpls/netbeans/nbproject/configurations.xml.tpl
index b0b7e5c7..099e0e41 100644
--- a/platformio/project/tpls/netbeans/nbproject/configurations.xml.tpl
+++ b/platformio/project/tpls/netbeans/nbproject/configurations.xml.tpl
@@ -30,8 +30,8 @@
       <makefileType>
         <makeTool>
           <buildCommandWorkingDir>.</buildCommandWorkingDir>
-          <buildCommand>{{platformio_path}} -f -c netbeans run</buildCommand>
-          <cleanCommand>{{platformio_path}} -f -c netbeans run --target clean</cleanCommand>
+          <buildCommand>"{{platformio_path}}" -f -c netbeans run</buildCommand>
+          <cleanCommand>"{{platformio_path}}" -f -c netbeans run --target clean</cleanCommand>
           <executablePath></executablePath>
           <cTool>
             % cleaned_includes = filter_includes(includes)