diff --git a/platform/util/src/com/intellij/util/ConcurrencyUtil.java b/platform/util/src/com/intellij/util/ConcurrencyUtil.java
index 4e98b30a5b99..74c78ec42308 100644
--- a/platform/util/src/com/intellij/util/ConcurrencyUtil.java
+++ b/platform/util/src/com/intellij/util/ConcurrencyUtil.java
@@ -99,6 +99,7 @@ public class ConcurrencyUtil {
                                     new LinkedBlockingQueue<Runnable>(), new ThreadFactory() {
       public Thread newThread(final Runnable r) {
         final Thread thread = new Thread(r, threadFactoryName);
+        thread.setDaemon(true);
         thread.setPriority(threadPriority);
         return thread;
       }
@@ -115,6 +116,7 @@ public class ConcurrencyUtil {
     ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1, new ThreadFactory() {
       public Thread newThread(final Runnable r) {
         final Thread thread = new Thread(r, threadFactoryName);
+        thread.setDaemon(true);
         thread.setPriority(threadPriority);
         return thread;
       }