diff --git a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ActionManager.kt b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ActionManager.kt
index c8dde645f5c9..58cb0e555f05 100644
--- a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ActionManager.kt
+++ b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ActionManager.kt
@@ -4,6 +4,7 @@ import com.intellij.driver.client.Driver
 import com.intellij.driver.client.Remote
 import com.intellij.driver.client.service
 import com.intellij.driver.model.OnDispatcher
+import com.intellij.driver.model.RdTarget
 import com.intellij.driver.sdk.ui.remote.Component
 import java.awt.event.InputEvent
 
@@ -24,9 +25,10 @@ interface AnAction
 @Remote(value = "com.intellij.openapi.util.ActionCallback")
 interface ActionCallback
 
-fun Driver.invokeAction(actionId: String, now: Boolean = true) {
+fun Driver.invokeAction(actionId: String, now: Boolean = true, rdTarget: RdTarget? = null) {
   withContext(OnDispatcher.EDT) {
-    val actionManager = service<ActionManager>()
+    val target = rdTarget ?: if (isRemoteIdeMode) RdTarget.FRONTEND else RdTarget.DEFAULT
+    val actionManager = service<ActionManager>(target)
     val action = actionManager.getAction(actionId)
     if (action == null) {
       throw IllegalStateException("Action $actionId was not found")