diff --git a/src/components/Image/util/images.ts b/src/components/Image/util/images.ts
index c7e3fe0..edf2c9d 100644
--- a/src/components/Image/util/images.ts
+++ b/src/components/Image/util/images.ts
@@ -41,16 +41,17 @@ export const logos = [
   'connector/taho',
   'connector/zengo',
   'connector/ledger',
-  'connector/ledgerLive',
   'connector/portis',
   'connector/binance',
   'connector/coinbase',
   'connector/metamask',
   'connector/gnosisSafe',
+  'connector/ledgerLive',
   'connector/trustWallet',
   'connector/braveBrowser',
   'connector/walletConnect',
   'connector/monitorAddress',
+
   'image/error',
   'image/magic',
   'image/success',
diff --git a/src/layouts/AppLayout/Header/Connect/Account/AccountMenu/AccountMenu.tsx b/src/layouts/AppLayout/Header/Connect/Account/AccountMenu/AccountMenu.tsx
index 822c833..7c11be7 100644
--- a/src/layouts/AppLayout/Header/Connect/Account/AccountMenu/AccountMenu.tsx
+++ b/src/layouts/AppLayout/Header/Connect/Account/AccountMenu/AccountMenu.tsx
@@ -15,18 +15,18 @@ type AccountMenuProps = {
   logo: LogoProps['name']
 }
 
+const disableDisconnect = new Set<string>([
+  wallets.dAppBrowser.id,
+  wallets.ledgerLive.id,
+])
+
 const AccountMenu: React.FC<AccountMenuProps> = (props) => {
   const { logo } = props
 
   const { activeWallet } = useConfig()
   const claimsTotal = useClaimsTotal()
 
-  const NON_DISCONNECTABLE_WALLET_IDS = new Set<string>([
-    wallets.dAppBrowser.id,
-    wallets.ledgerLive.id,
-  ])
-
-  const shouldShowDisconnect = activeWallet !== null && !NON_DISCONNECTABLE_WALLET_IDS.has(activeWallet)
+  const shouldShowDisconnect = activeWallet !== null && !disableDisconnect.has(activeWallet)
 
   return (
     <>
diff --git a/src/modules/device/ctx.ts b/src/modules/device/ctx.ts
index 67d1093..402f0a2 100644
--- a/src/modules/device/ctx.ts
+++ b/src/modules/device/ctx.ts
@@ -44,9 +44,11 @@ const {
 
     handleSetDevice()
 
+    tabletMediaQuery.addEventListener('change', handleSetDevice)
     desktopMediaQuery.addEventListener('change', handleSetDevice)
 
     return () => {
+      tabletMediaQuery.removeEventListener('change', handleSetDevice)
       desktopMediaQuery.removeEventListener('change', handleSetDevice)
     }
   }, [ onChange ])