diff --git a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/FrameHeaderUI.kt b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/FrameHeaderUI.kt
index 4d28fe9358ea..4fa376e09b49 100644
--- a/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/FrameHeaderUI.kt
+++ b/platform/remote-driver/test-sdk/src/com/intellij/driver/sdk/ui/components/FrameHeaderUI.kt
@@ -1,13 +1,9 @@
 package com.intellij.driver.sdk.ui.components
 
 import com.intellij.driver.sdk.ui.Finder
-import com.intellij.driver.sdk.ui.xQuery
-import com.intellij.openapi.util.SystemInfo.isLinux
 
-val Finder.toolbarHeader: FrameHeaderUI
-  get() = x(xQuery {
-    or(byClass("MacToolbarFrameHeader"), if (isLinux) byClass("MainToolbar") else byClass("ToolbarFrameHeader"))
-  }, FrameHeaderUI::class.java)
+val Finder.toolbarHeader: FrameHeaderUI get() =
+  x("//div[@class='MacToolbarFrameHeader' or @class='ToolbarFrameHeader']", FrameHeaderUI::class.java)
 
 class FrameHeaderUI(data: ComponentData) : UiComponent(data) {
   val separateRowMenu: UiComponent get() = x("//div[@class='IdeJMenuBar']")