diff --git a/packages/components/src/components/Modal/ModalBackdrop.tsx b/packages/components/src/components/Modal/ModalBackdrop.tsx
index 3284a470ce41..ddaf71bac27e 100644
--- a/packages/components/src/components/Modal/ModalBackdrop.tsx
+++ b/packages/components/src/components/Modal/ModalBackdrop.tsx
@@ -20,6 +20,7 @@ export type ModalBackdropProps = {
     padding?: Padding;
     zIndex?: ZIndexValues;
     opaque?: boolean;
+    'data-testid'?: string;
 };
 
 const Backdrop = styled.div<{ $opaque?: boolean }>`
@@ -46,6 +47,7 @@ export const ModalBackdrop = ({
     padding = spacings.xs,
     zIndex = zIndices.modal,
     opaque = false,
+    'data-testid': dataTest,
 }: ModalBackdropProps) => {
     const modalTarget = useModalTarget();
 
@@ -53,7 +55,7 @@ export const ModalBackdrop = ({
         // eslint-disable-next-line jsx-a11y/no-autofocus
         <FocusLock autoFocus={false}>
             <Box position={{ type: 'absolute', inset: 0 }} zIndex={zIndex}>
-                <Backdrop onClick={onClick} $opaque={opaque}>
+                <Backdrop onClick={onClick} $opaque={opaque} data-testid={dataTest}>
                     <Box padding={padding} height="100%">
                         <Column
                             alignItems={mapAlignmentToAlignItems(alignment)}
diff --git a/packages/suite-desktop-core/e2e/support/pageObjects/dashboardPage.ts b/packages/suite-desktop-core/e2e/support/pageObjects/dashboardPage.ts
index b95e9c79c99c..cb19add2a67a 100644
--- a/packages/suite-desktop-core/e2e/support/pageObjects/dashboardPage.ts
+++ b/packages/suite-desktop-core/e2e/support/pageObjects/dashboardPage.ts
@@ -53,9 +53,7 @@ export class DashboardPage {
         this.dashboardHeader = this.page.getByRole('heading', { name: 'Dashboard' });
         this.graph = this.page.getByTestId('@dashboard/graph');
         this.deviceSwitchingOpenButton = this.page.getByTestId('@menu/switch-device');
-        this.deviceSwitchingCloseButton = this.page
-            .getByTestId('@switch-device/cancel-button')
-            .first();
+        this.deviceSwitchingCloseButton = this.page.getByTestId('@modal/backdrop').first();
         this.modal = this.page.getByTestId('@modal');
         this.deviceSwitcherModal = this.page.getByTestId('@modal/switch-device');
         this.confirmDeviceEjectButton = this.page.getByTestId('@switch-device/eject');
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceHeader.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceHeader.tsx
index f1ee11b41e02..104b0066b485 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceHeader.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceHeader.tsx
@@ -2,7 +2,7 @@ import { ReactNode } from 'react';
 
 import { getDeviceInternalModel } from '@suite-common/suite-utils';
 import { selectSelectedDevice } from '@suite-common/wallet-core';
-import { Box, IconButton, Row, TOOLTIP_DELAY_LONG, Tooltip } from '@trezor/components';
+import { IconButton, Row, TOOLTIP_DELAY_LONG, Tooltip } from '@trezor/components';
 import { spacings } from '@trezor/theme';
 
 import { WebUsbButton } from 'src/components/suite';
@@ -59,21 +59,11 @@ export const DeviceHeader = ({
             )}
 
             {deviceModelInternal && isDeviceStatusVisible && (
-                // In case the cancel button is not visible (e.g. in device switcher),
-                // we need to have an alternative, mostly for testing purposes.
-                <Box
-                    data-testid={
-                        isDefaultCancelVisible ? undefined : '@switch-device/cancel-button'
-                    }
-                    onClick={isDefaultCancelVisible ? undefined : () => onCancel?.()}
-                    cursor={isDefaultCancelVisible ? 'default' : 'pointer'}
-                >
-                    <DeviceStatus
-                        deviceModel={deviceModelInternal}
-                        device={device}
-                        forceConnectionInfo={true}
-                    />
-                </Box>
+                <DeviceStatus
+                    deviceModel={deviceModelInternal}
+                    device={device}
+                    forceConnectionInfo={true}
+                />
             )}
 
             <Row gap={spacings.xxs} margin={{ left: 'auto' }}>
@@ -91,7 +81,6 @@ export const DeviceHeader = ({
                             size="small"
                             variant="tertiary"
                             onClick={() => onCancel()}
-                            data-testid="@switch-device/cancel-button"
                         />
                     </Tooltip>
                 )}
diff --git a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceStatusText.tsx b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceStatusText.tsx
index b340979e930f..8420b88e3583 100644
--- a/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceStatusText.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/DeviceItem/DeviceStatusText.tsx
@@ -2,11 +2,9 @@ import React from 'react';
 
 import { TrezorDevice } from '@suite-common/suite-types';
 import * as deviceUtils from '@suite-common/suite-utils';
-import { acquireDevice } from '@suite-common/wallet-core';
 
 import { Translation } from 'src/components/suite/Translation';
 
-import { useDispatch } from '../../../../hooks/suite';
 import { getDeviceResolveStatusCTAMessage } from '../getDeviceResolveStatusCTAMessage';
 import { DeviceConnectionText } from './DeviceConnectionText';
 import { DeviceStatusTextThp } from './DeviceStatusTextThp';
@@ -23,7 +21,6 @@ export const DeviceStatusText = ({
     deviceNeedsRefresh,
 }: DeviceStatusTextProps) => {
     const deviceStatus = deviceUtils.getStatus(device);
-    const dispatch = useDispatch();
     if (deviceNeedsRefresh) {
         return (
             <DeviceConnectionText
@@ -32,15 +29,6 @@ export const DeviceStatusText = ({
                 data-testid="@deviceStatus-connected"
                 data-testid-alt="@deviceStatus"
                 isAction
-                onClick={(e: React.MouseEvent) => {
-                    e.stopPropagation();
-
-                    dispatch(
-                        acquireDevice({
-                            requestedDevice: device,
-                        }),
-                    );
-                }}
             >
                 <Translation id={getDeviceResolveStatusCTAMessage(deviceStatus)} />
             </DeviceConnectionText>
diff --git a/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceModal.tsx b/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceModal.tsx
index e296a7062157..2f057ce2b0bf 100644
--- a/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceModal.tsx
+++ b/packages/suite/src/views/suite/SwitchDevice/SwitchDeviceModal.tsx
@@ -40,6 +40,7 @@ export const SwitchDeviceModal = ({
     return (
         <Modal.Backdrop
             onClick={onCancel}
+            data-testid={`${dataTest}/backdrop`}
             alignment={{ x: 'start', y: 'start' }}
             padding={spacings.xs}
         >