diff --git a/packages/next-common/components/header/drawer.jsx b/packages/next-common/components/header/drawer.jsx
index 5f7791378b..7ca5ce5886 100644
--- a/packages/next-common/components/header/drawer.jsx
+++ b/packages/next-common/components/header/drawer.jsx
@@ -163,7 +163,9 @@ export default function SidebarAccount() {
export function WalletConnectDisconnectLoading({ type }) {
const { disconnectLoading } = useWalletConnect();
- if (!disconnectLoading || type !== "logout") {
+ const { disconnectLoading: evmDisconnectLoading } =
+ useConnectedAccountContext();
+ if (!(disconnectLoading || evmDisconnectLoading) || type !== "logout") {
return null;
}
return
@@ -31,28 +60,18 @@ export default function LinkedAddressSelectWalletPopup({
/>
)}
- {isEVMView && (
+ {isEVMView && walletConnect.isOpen && (
+