diff --git a/java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java b/java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java
index a506a6b15add..1fe13ae33580 100644
--- a/java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java
+++ b/java/execution/impl/src/com/intellij/execution/application/BaseJavaApplicationCommandLineState.java
@@ -25,6 +25,7 @@ import com.intellij.execution.configurations.RunConfigurationBase;
 import com.intellij.execution.configurations.RunnerSettings;
 import com.intellij.execution.process.KillableColoredProcessHandler;
 import com.intellij.execution.process.OSProcessHandler;
+import com.intellij.execution.process.ProcessTerminatedListener;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.util.JavaParametersUtil;
 import com.intellij.openapi.util.SystemInfo;
@@ -52,7 +53,15 @@ public abstract class BaseJavaApplicationCommandLineState<T extends RunConfigura
   @NotNull
   @Override
   protected OSProcessHandler startProcess() throws ExecutionException {
-    OSProcessHandler handler = SystemInfo.isWindows ? super.startProcess() : KillableColoredProcessHandler.create(createCommandLine());
+    OSProcessHandler handler;
+    if (SystemInfo.isWindows) {
+      handler = super.startProcess();
+    }
+    else {
+      handler = KillableColoredProcessHandler.create(createCommandLine());
+      ProcessTerminatedListener.attach(handler);
+    }
+
     RunnerSettings runnerSettings = getRunnerSettings();
     JavaRunConfigurationExtensionManager.getInstance().attachExtensionsToProcess(getConfiguration(), handler, runnerSettings);
     return handler;