diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
index 83f1c9dbe005..3c71e0a4dc41 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java
@@ -1463,9 +1463,10 @@ public abstract class DebugProcessImpl implements DebugProcess {
         breakpointManager.disableBreakpoints(DebugProcessImpl.this);
       }
       applyThreadFilter(getContextThread());
-      myRunToCursorBreakpoint.SUSPEND_POLICY = DebuggerSettings.SUSPEND_ALL;
+      final SuspendContextImpl context = getSuspendContext();
+      myRunToCursorBreakpoint.SUSPEND_POLICY = context.getSuspendPolicy() == EventRequest.SUSPEND_EVENT_THREAD? DebuggerSettings.SUSPEND_THREAD : DebuggerSettings.SUSPEND_ALL;
       myRunToCursorBreakpoint.LOG_ENABLED = false;
-      myRunToCursorBreakpoint.createRequest(getSuspendContext().getDebugProcess());
+      myRunToCursorBreakpoint.createRequest(context.getDebugProcess());
       DebugProcessImpl.this.myRunToCursorBreakpoint = myRunToCursorBreakpoint;
       super.contextAction();
     }