diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
index 72b53632951..4617806ede3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/stepping/KotlinSteppingCommandProvider.kt
@@ -20,7 +20,6 @@ import com.intellij.debugger.NoDataException
 import com.intellij.debugger.SourcePosition
 import com.intellij.debugger.engine.DebugProcessImpl
 import com.intellij.debugger.engine.SuspendContextImpl
-import com.intellij.debugger.engine.events.SuspendContextCommandImpl
 import com.intellij.debugger.impl.DebuggerContextImpl
 import com.intellij.debugger.impl.JvmSteppingCommandProvider
 import com.intellij.psi.PsiElement
@@ -331,23 +330,14 @@ sealed class Action(val position: XSourcePositionImpl?) {
     fun apply(debugProcess: DebugProcessImpl,
               suspendContext: SuspendContextImpl,
               ignoreBreakpoints: Boolean) {
-        val command = createCommand(debugProcess, suspendContext, ignoreBreakpoints)
-        command.contextAction()
-    }
-
-    private fun createCommand(
-            debugProcess: DebugProcessImpl,
-            suspendContext: SuspendContextImpl,
-            ignoreBreakpoints: Boolean
-    ): SuspendContextCommandImpl {
-        return when (this) {
+        when (this) {
             is Action.RUN_TO_CURSOR -> {
                 runReadAction {
                     debugProcess.createRunToCursorCommand(suspendContext, position!!, ignoreBreakpoints)
-                }
+                }.contextAction()
             }
-            is Action.STEP_OUT -> debugProcess.createStepOutCommand(suspendContext)
-            is Action.STEP_OVER -> debugProcess.createStepOverCommand(suspendContext, ignoreBreakpoints)
+            is Action.STEP_OUT -> debugProcess.createStepOutCommand(suspendContext).contextAction()
+            is Action.STEP_OVER -> debugProcess.createStepOverCommand(suspendContext, ignoreBreakpoints).contextAction()
         }
     }
 }