diff --git a/e2e/wdio/core/pages/action-sheet.po.ts b/e2e/wdio/core/pages/action-sheet.po.ts
index d9ff1320c46..e6b7bb6876a 100644
--- a/e2e/wdio/core/pages/action-sheet.po.ts
+++ b/e2e/wdio/core/pages/action-sheet.po.ts
@@ -5,7 +5,7 @@ export class ActionSheetPo extends CoreBaseComponentPo {
     url = '/action-sheet';
     root = '#page-content';
 
-    actionSheetMenuButton = 'fd-action-sheet-control button';
+    actionSheetMenuButton = 'app-action-sheet fd-action-sheet-control button';
     actionSheetList = 'fd-action-sheet-body ul';
     actionSheetListItems = 'fd-action-sheet-body li';
     actionSheetListItemButtons = 'fd-action-sheet-body button';
diff --git a/e2e/wdio/core/pages/product-switch.po.ts b/e2e/wdio/core/pages/product-switch.po.ts
index 49fb9d326f8..0dec0b2876a 100644
--- a/e2e/wdio/core/pages/product-switch.po.ts
+++ b/e2e/wdio/core/pages/product-switch.po.ts
@@ -4,7 +4,7 @@ import { waitForElDisplayed, waitForPresent } from '../../driver/wdio';
 export class ProductSwitchPo extends CoreBaseComponentPo {
     url = '/product-switch';
 
-    shellbarButton = 'fd-popover-control button';
+    shellbarButton = 'app-product-switch fd-popover-control button';
     shellbarSwitchItems = 'fd-popover-body .fd-product-switch__item';
     switchItems = 'fd-product-switch-body .fd-product-switch__item';
 
diff --git a/e2e/wdio/platform/pages/value-help-dialog.po.ts b/e2e/wdio/platform/pages/value-help-dialog.po.ts
index 57fd161041d..2177d6ed01c 100644
--- a/e2e/wdio/platform/pages/value-help-dialog.po.ts
+++ b/e2e/wdio/platform/pages/value-help-dialog.po.ts
@@ -9,7 +9,7 @@ export class ValueHelpDialogPo extends BaseComponentPo {
     // Example block selectors
     inputToken = 'fd-token .fd-token';
     menuCheckboxes = 'fd-popover-body fd-checkbox';
-    menuDialogBtn = 'fd-popover button';
+    menuDialogBtn = 'app-platform-vhd fd-popover button';
     menuItemNames = 'fd-popover-body .fd-list__title';
     miniOpenDialogBtn = 'button[class*="fd-button--compact"]';
     mobileExampleDialog = 'fdp-value-help-dialog[dialogtitle="Mobile value help dialog"]';