diff --git a/tests/setup/wallet-provider.ts b/tests/setup/wallet-provider.ts
index f9c4b28..cc05116 100644
--- a/tests/setup/wallet-provider.ts
+++ b/tests/setup/wallet-provider.ts
@@ -29,20 +29,9 @@ export async function createWalletContext(
   const address = wallet.address;
   const chainIdHex = `0x${chainId.toString(16)}`;
 
-  const context = await browser.newContext();
-
-  // Override screen.width to ensure desktop mode (the app uses screen.width for mobile detection)
-  // In headless CI environments, screen.width may not match the viewport
-  await context.addInitScript(() => {
-    Object.defineProperty(window.screen, 'width', {
-      configurable: true,
-      value: 1280,
-    });
-    Object.defineProperty(window.screen, 'availWidth', {
-      configurable: true,
-      value: 1280,
-    });
-    console.info('[wallet-provider] Set screen.width to 1280 for desktop mode');
+  const context = await browser.newContext({
+    viewport: { width: 1280, height: 720 },
+    screen: { width: 1280, height: 720 },
   });
 
   await context.addInitScript(() => {
diff --git a/web-app/src/composables/useMobile.ts b/web-app/src/composables/useMobile.ts
index e7aa454..4135f9f 100644
--- a/web-app/src/composables/useMobile.ts
+++ b/web-app/src/composables/useMobile.ts
@@ -10,7 +10,7 @@ export function useMobile() {
 
   isMobile.value = isMobileFunc();
   function isMobileFunc() {
-    if (screen.width <= 768) {
+    if (window.innerWidth <= 768) {
       return true;
     } else {
       return false;