diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerSmartStepIntoHandler.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerSmartStepIntoHandler.java
index 08cc42510a9a..0d1624f0ced2 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerSmartStepIntoHandler.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/handlers/XDebuggerSmartStepIntoHandler.java
@@ -97,13 +97,15 @@ public class XDebuggerSmartStepIntoHandler extends XDebuggerSuspendedActionHandl
     if (stepData != null) {
       stepData.stepInto(stepData.myCurrentVariant);
     }
-    computeVariants(handler, position)
-      .onSuccess(variants -> UIUtil.invokeLaterIfNeeded(() -> {
-                                                          if (!handleSimpleCases(handler, variants, session)) {
-                                                            choose(handler, variants, position, session, editor);
-                                                          }
-                                                        }))
-      .onError(throwable -> session.stepInto());
+    else {
+      computeVariants(handler, position)
+        .onSuccess(variants -> UIUtil.invokeLaterIfNeeded(() -> {
+          if (!handleSimpleCases(handler, variants, session)) {
+            choose(handler, variants, position, session, editor);
+          }
+        }))
+        .onError(throwable -> session.stepInto());
+    }
   }
 
   protected <V extends XSmartStepIntoVariant> Promise<List<V>> computeVariants(XSmartStepIntoHandler<V> handler, XSourcePosition position) {