diff --git a/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java b/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
index 2e0f0477dbe0..410932230729 100644
--- a/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
+++ b/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
@@ -40,6 +40,7 @@ public class RunContentDescriptor implements Disposable {
   private final String myHelpId;
 
   private boolean myActivateToolWindowWhenAdded = true;
+  private boolean myReuseActivation = false;
   private long myExecutionId = 0;
   private Computable<JComponent> myFocusComputable = null;
   private boolean myAutoFocusContent = false;
@@ -157,6 +158,14 @@ public class RunContentDescriptor implements Disposable {
     myActivateToolWindowWhenAdded = activateToolWindowWhenAdded;
   }
 
+  public boolean isReuseActivation() {
+    return myReuseActivation;
+  }
+
+  public void setReuseActivation(boolean reuseActivation) {
+    myReuseActivation = reuseActivation;
+  }
+
   public long getExecutionId() {
     return myExecutionId;
   }
diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
index 0cc259a0ab45..abf3809bc915 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
@@ -260,7 +260,12 @@ public class RunContentBuilder extends LogConsoleManagerBase {
    */
   public RunContentDescriptor showRunContent(final RunContentDescriptor reuseContent) {
     final RunContentDescriptor descriptor = createDescriptor();
-    if(reuseContent != null) descriptor.setAttachedContent(reuseContent.getAttachedContent());
+    if (reuseContent != null) {
+      descriptor.setAttachedContent(reuseContent.getAttachedContent());
+      if (reuseContent.isReuseActivation()) {
+        descriptor.setActivateToolWindowWhenAdded(reuseContent.isActivateToolWindowWhenAdded());
+      }
+    }
     return descriptor;
   }