diff --git a/src/cli.js b/src/cli.js
index c171dc0a4a35..1ae6bf54e7bb 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -700,6 +700,13 @@ async function build() {
 
     watcher = chokidar.watch([...contextDependencies, ...extractFileGlobs(config)], {
       ignoreInitial: true,
+      awaitWriteFinish:
+        process.platform === 'win32'
+          ? {
+              stabilityThreshold: 50,
+              pollInterval: 10,
+            }
+          : false,
     })
 
     let chain = Promise.resolve()
diff --git a/src/lib/setupWatchingContext.js b/src/lib/setupWatchingContext.js
index c20d043dd134..1ee1eaf3094e 100644
--- a/src/lib/setupWatchingContext.js
+++ b/src/lib/setupWatchingContext.js
@@ -84,6 +84,13 @@ function rebootWatcher(context, configPath, configDependencies, candidateFiles)
 
     watcher = chokidar.watch([...candidateFiles, ...configDependencies], {
       ignoreInitial: true,
+      awaitWriteFinish:
+        process.platform === 'win32'
+          ? {
+              stabilityThreshold: 50,
+              pollInterval: 10,
+            }
+          : false,
     })
 
     setWatcher(context, watcher)