diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx
index 80cda23d..0cd1d7c9 100644
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@@ -70,7 +70,7 @@ export default function Layout(): JSX.Element | null {
                 <Bars3Icon className="w-7" />
               </button>
             </div>
-            <OpenWallet dAppName={dAppName} />
+            <OpenWallet isHeader />
             <ChainSelector />
             <GetToken />
             <div className="dropdown dropdown-end mr-2 hidden">
diff --git a/src/components/Wallet/index.tsx b/src/components/Wallet/index.tsx
index 699cfbdd..aa0180ee 100644
--- a/src/components/Wallet/index.tsx
+++ b/src/components/Wallet/index.tsx
@@ -12,8 +12,12 @@ import MetamaskWallet from './MetamaskWallet';
 import NovaWallet from './NovaWallet';
 import WalletConnect from './WalletConnect';
 
-const OpenWallet = ({ dAppName }: { dAppName: string }): JSX.Element => {
-  const { walletAccount, setWalletAccount, removeWalletAccount } = useGlobalState();
+interface Props {
+  isHeader?: boolean;
+}
+
+const OpenWallet = (props: Props): JSX.Element => {
+  const { walletAccount, dAppName, setWalletAccount, removeWalletAccount } = useGlobalState();
   const { wallet, address } = walletAccount || {};
   const { query, balance } = useAccountBalance();
   const { ss58Format, tokenSymbol } = useNodeInfoState().state;
@@ -64,7 +68,12 @@ const OpenWallet = ({ dAppName }: { dAppName: string }): JSX.Element => {
             open={false}
             showAccountsList={true}
             triggerComponent={
-              <Button size="sm" className={`text-sm min-h-[2.1rem] h-auto px-1 sm:px-3`} color="primary" type="button">
+              <Button
+                size={props.isHeader ? 'sm' : undefined}
+                className={props.isHeader ? 'text-sm min-h-[2.1rem] h-auto px-1 sm:px-3 ' : 'w-full'}
+                color="primary"
+                type="button"
+              >
                 Connect to Wallet
               </Button>
             }
diff --git a/src/components/nabla/Pools/Backstop/AddLiquidity/index.tsx b/src/components/nabla/Pools/Backstop/AddLiquidity/index.tsx
index 6e8555fc..32ca47ec 100644
--- a/src/components/nabla/Pools/Backstop/AddLiquidity/index.tsx
+++ b/src/components/nabla/Pools/Backstop/AddLiquidity/index.tsx
@@ -14,6 +14,8 @@ import { FormProvider } from 'react-hook-form';
 import { AmountSelector } from '../../../common/AmountSelector';
 import { calcSharePercentage } from '../../../../../helpers/calc';
 import { TokenBalance } from '../../../common/TokenBalance';
+import { useGlobalState } from '../../../../../GlobalStateProvider';
+import OpenWallet from '../../../../Wallet';
 
 interface AddLiquidityProps {
   data: NablaInstanceBackstopPool;
@@ -23,6 +25,8 @@ const AddLiquidity = ({ data }: AddLiquidityProps): JSX.Element | null => {
   const { toggle, onSubmit, mutation, depositQuery, balanceQuery, amountString, amountBigDecimal, form } =
     useAddLiquidity(data.id, data.token.id, data.token.decimals, data.lpTokenDecimals);
 
+  const { walletAccount } = useGlobalState();
+
   const {
     formState: { errors },
   } = form;
@@ -45,14 +49,16 @@ const AddLiquidity = ({ data }: AddLiquidityProps): JSX.Element | null => {
         </div>
         <FormProvider {...form}>
           <form onSubmit={onSubmit}>
-            <div className="flex justify-between align-end text-sm text-initial my-3">
-              <p>
-                Deposited: <TokenBalance query={depositQuery} symbol={data.symbol}></TokenBalance>
-              </p>
-              <p className="text-neutral-500 dark:text-neutral-400 text-right">
-                Balance: <TokenBalance query={balanceQuery} symbol={data.token.symbol}></TokenBalance>
-              </p>
-            </div>
+            {walletAccount && (
+              <div className="flex justify-between align-end text-sm text-initial my-3">
+                <p>
+                  Deposited: <TokenBalance query={depositQuery} symbol={data.symbol}></TokenBalance>
+                </p>
+                <p className="text-neutral-500 dark:text-neutral-400 text-right">
+                  Balance: <TokenBalance query={balanceQuery} symbol={data.token.symbol}></TokenBalance>
+                </p>
+              </div>
+            )}
             <AmountSelector maxBalance={balanceQuery.data} formFieldName="amount" form={form} />
             <Validation className="text-center mt-2" errors={errors} />
             <div className="relative flex w-full flex-col gap-4 rounded-lg bg-neutral-100 dark:bg-neutral-700 text-neutral-500 dark:text-neutral-300 p-4 mt-4">
@@ -62,17 +68,19 @@ const AddLiquidity = ({ data }: AddLiquidityProps): JSX.Element | null => {
                   {stringifyBigWithSignificantDecimals(totalSupplyOfLpTokens, 2)} {data.symbol}
                 </div>
               </div>
-              <div className="flex items-center justify-between">
-                <div>Your pool Share</div>
-                <div>
-                  {depositQuery.data === undefined ? (
-                    <NumberLoader />
-                  ) : (
-                    calcSharePercentage(totalSupplyOfLpTokens, depositQuery.data.preciseBigDecimal)
-                  )}
-                  %
+              {walletAccount && (
+                <div className="flex items-center justify-between">
+                  <div>Your pool Share</div>
+                  <div>
+                    {depositQuery.data === undefined ? (
+                      <NumberLoader />
+                    ) : (
+                      calcSharePercentage(totalSupplyOfLpTokens, depositQuery.data.preciseBigDecimal)
+                    )}
+                    %
+                  </div>
                 </div>
-              </div>
+              )}
             </div>
             <div className="mt-8">
               <TokenApproval
@@ -83,9 +91,13 @@ const AddLiquidity = ({ data }: AddLiquidityProps): JSX.Element | null => {
                 decimalAmount={amountBigDecimal}
                 enabled={submitEnabled}
               >
-                <Button color="primary" className="w-full" type="submit" disabled={!submitEnabled}>
-                  Deposit
-                </Button>
+                {walletAccount ? (
+                  <Button color="primary" className="w-full" type="submit" disabled={!submitEnabled}>
+                    Deposit
+                  </Button>
+                ) : (
+                  <OpenWallet />
+                )}
               </TokenApproval>
               <Button
                 color="secondary"
diff --git a/src/components/nabla/Pools/Backstop/WithdrawLiquidity/index.tsx b/src/components/nabla/Pools/Backstop/WithdrawLiquidity/index.tsx
index 7cc55b67..b437778a 100644
--- a/src/components/nabla/Pools/Backstop/WithdrawLiquidity/index.tsx
+++ b/src/components/nabla/Pools/Backstop/WithdrawLiquidity/index.tsx
@@ -16,6 +16,8 @@ import { TransactionSettingsDropdown } from '../../../common/TransactionSettings
 import { PoolSelectorModal } from '../../../common/PoolSelectorModal';
 import { TokenBalance } from '../../../common/TokenBalance';
 import { AmountSelector } from '../../../common/AmountSelector';
+import { useGlobalState } from '../../../../../GlobalStateProvider';
+import OpenWallet from '../../../../Wallet';
 
 const WithdrawLiquidityBody = ({ nabla }: { nabla: NablaInstance }): JSX.Element | null => {
   const [showTokenModal, setShowTokenModal] = useState(false);
@@ -34,6 +36,8 @@ const WithdrawLiquidityBody = ({ nabla }: { nabla: NablaInstance }): JSX.Element
     updateStorage,
   } = useWithdrawLiquidity(nabla);
 
+  const { walletAccount } = useGlobalState();
+
   const {
     register,
     setValue,
@@ -81,14 +85,16 @@ const WithdrawLiquidityBody = ({ nabla }: { nabla: NablaInstance }): JSX.Element
       <div className={hideCss}>
         <FormProvider {...form}>
           <form onSubmit={onSubmit}>
-            <div className="flex justify-between align-end text-sm text-initial my-3">
-              <p>
-                Deposited: <TokenBalance query={depositQuery} symbol={backstopPool.symbol}></TokenBalance>
-              </p>
-              <p className="text-neutral-500 dark:text-neutral-400 text-right">
-                Balance: <TokenBalance query={balanceQuery} symbol={tokenToReceive.symbol}></TokenBalance>
-              </p>
-            </div>
+            {walletAccount && (
+              <div className="flex justify-between align-end text-sm text-initial my-3">
+                <p>
+                  Deposited: <TokenBalance query={depositQuery} symbol={backstopPool.symbol}></TokenBalance>
+                </p>
+                <p className="text-neutral-500 dark:text-neutral-400 text-right">
+                  Balance: <TokenBalance query={balanceQuery} symbol={tokenToReceive.symbol}></TokenBalance>
+                </p>
+              </div>
+            )}
             <AmountSelector maxBalance={depositQuery.data} formFieldName="amount" form={form}>
               <div className="flex items-start justify-start pt-2">
                 <div className="flex-grow">
@@ -100,10 +106,12 @@ const WithdrawLiquidityBody = ({ nabla }: { nabla: NablaInstance }): JSX.Element
                       significantDecimals={2}
                     ></TokenBalance>
                   </div>
-                  <div className="text-neutral-500 text-sm dark:text-neutral-400 flex items-center justify-between flex-grow mr-2">
-                    <div>Your current balance</div>
-                    <TokenBalance query={balanceQuery} symbol={tokenToReceive.symbol}></TokenBalance>
-                  </div>
+                  {walletAccount && (
+                    <div className="text-neutral-500 text-sm dark:text-neutral-400 flex items-center justify-between flex-grow mr-2">
+                      <div>Your current balance</div>
+                      <TokenBalance query={balanceQuery} symbol={tokenToReceive.symbol}></TokenBalance>
+                    </div>
+                  )}
                 </div>
                 <TransactionSettingsDropdown
                   setSlippage={(slippage) => {
@@ -128,22 +136,28 @@ const WithdrawLiquidityBody = ({ nabla }: { nabla: NablaInstance }): JSX.Element
                   {stringifyBigWithSignificantDecimals(totalSupplyOfLpTokens, 2)} {backstopPool.symbol}
                 </div>
               </div>
-              <div className="flex items-center justify-between">
-                <div>Your backstop pool share</div>
-                <div>
-                  {depositQuery.data === undefined ? (
-                    <NumberLoader />
-                  ) : (
-                    calcSharePercentage(totalSupplyOfLpTokens, depositQuery.data.preciseBigDecimal)
-                  )}
-                  %
+              {walletAccount && (
+                <div className="flex items-center justify-between">
+                  <div>Your backstop pool share</div>
+                  <div>
+                    {depositQuery.data === undefined ? (
+                      <NumberLoader />
+                    ) : (
+                      calcSharePercentage(totalSupplyOfLpTokens, depositQuery.data.preciseBigDecimal)
+                    )}
+                    %
+                  </div>
                 </div>
-              </div>
+              )}
             </div>
             <div className="mt-8">
-              <Button color="primary" className="w-full" type="submit" disabled={!submitEnabled}>
-                Withdraw
-              </Button>
+              {walletAccount ? (
+                <Button color="primary" className="w-full" type="submit" disabled={!submitEnabled}>
+                  Withdraw
+                </Button>
+              ) : (
+                <OpenWallet />
+              )}
               <Button color="secondary" className="mt-2 w-full" type="button" onClick={() => toggle()}>
                 Cancel
               </Button>
diff --git a/src/components/nabla/Pools/Backstop/index.tsx b/src/components/nabla/Pools/Backstop/index.tsx
index e655875b..8a24342c 100644
--- a/src/components/nabla/Pools/Backstop/index.tsx
+++ b/src/components/nabla/Pools/Backstop/index.tsx
@@ -6,11 +6,14 @@ import { backstopPoolAbi } from '../../../../contracts/nabla/BackstopPool';
 import { Erc20Balance } from '../../common/Erc20Balance';
 import { BackstopPoolModals, LiquidityModalProps } from './BackstopPoolModals';
 import { NablaFootnote } from '../../common/NablaFootnote';
+import { useGlobalState } from '../../../../GlobalStateProvider';
 
 const BackstopPoolsBody = (): JSX.Element | null => {
   const toggle = useModalToggle<LiquidityModalProps>();
   const { nabla, isLoading } = useNablaInstance();
 
+  const { walletAccount } = useGlobalState();
+
   if (isLoading) return <Skeleton className="bg-neutral-200 h-48 w-full" />;
   const pool = nabla?.backstopPool;
   if (!pool) return <h3 className="text-center">No backstop pools</h3>;
@@ -20,19 +23,21 @@ const BackstopPoolsBody = (): JSX.Element | null => {
       <div className="text-[initial] dark:text-neutral-200 center w-full">
         <Card bordered className="w-full max-w-xl bg-base-200">
           <div className="card-body p-4 md:p-6">
-            <div className="flex items-center justify-between gap-2 text-3xl">
-              <h2>My pool balance</h2>
-              <div>
-                <Erc20Balance
-                  abi={backstopPoolAbi}
-                  erc20ContractDefinition={{
-                    contractAddress: pool.id,
-                    decimals: pool.lpTokenDecimals,
-                    symbol: pool.symbol,
-                  }}
-                />
+            {walletAccount && (
+              <div className="flex items-center justify-between gap-2 text-3xl">
+                <h2>My pool balance</h2>
+                <div>
+                  <Erc20Balance
+                    abi={backstopPoolAbi}
+                    erc20ContractDefinition={{
+                      contractAddress: pool.id,
+                      decimals: pool.lpTokenDecimals,
+                      symbol: pool.symbol,
+                    }}
+                  />
+                </div>
               </div>
-            </div>
+            )}
             <div className="flex flex-col items-center gap-2 mt-4">
               <Button
                 className="w-full"
diff --git a/src/components/nabla/Pools/Swap/AddLiquidity/index.tsx b/src/components/nabla/Pools/Swap/AddLiquidity/index.tsx
index d2aaee5a..0f6b2375 100644
--- a/src/components/nabla/Pools/Swap/AddLiquidity/index.tsx
+++ b/src/components/nabla/Pools/Swap/AddLiquidity/index.tsx
@@ -14,6 +14,8 @@ import { TransactionProgress } from '../../../common/TransactionProgress';
 import { TokenApproval } from '../../../common/TokenApproval';
 import { TokenBalance } from '../../../common/TokenBalance';
 import { AmountSelector } from '../../../common/AmountSelector';
+import { useGlobalState } from '../../../../../GlobalStateProvider';
+import OpenWallet from '../../../../Wallet';
 
 export interface AddLiquidityProps {
   data: SwapPoolColumn;
@@ -23,6 +25,8 @@ const AddLiquidity = ({ data }: AddLiquidityProps): JSX.Element | null => {
   const { toggle, onSubmit, mutation, depositQuery, balanceQuery, amountString, amountBigDecimal, form } =
     useAddLiquidity(data.id, data.token.id, data.token.decimals, data.lpTokenDecimals);
 
+  const { walletAccount } = useGlobalState();
+
   const {
     formState: { errors },
   } = form;
@@ -45,14 +49,16 @@ const AddLiquidity = ({ data }: AddLiquidityProps): JSX.Element | null => {
         </div>
         <FormProvider {...form}>
           <form onSubmit={onSubmit}>
-            <div className="flex justify-between align-end text-sm text-initial my-3">
-              <p>
-                Deposited: <TokenBalance query={depositQuery} symbol={data.symbol}></TokenBalance>
-              </p>
-              <p className="text-neutral-500 dark:text-neutral-400 text-right">
-                Balance: <TokenBalance query={balanceQuery} symbol={data.token.symbol}></TokenBalance>
-              </p>
-            </div>
+            {walletAccount && (
+              <div className="flex justify-between align-end text-sm text-initial my-3">
+                <p>
+                  Deposited: <TokenBalance query={depositQuery} symbol={data.symbol}></TokenBalance>
+                </p>
+                <p className="text-neutral-500 dark:text-neutral-400 text-right">
+                  Balance: <TokenBalance query={balanceQuery} symbol={data.token.symbol}></TokenBalance>
+                </p>
+              </div>
+            )}
             <AmountSelector maxBalance={balanceQuery.data} formFieldName="amount" form={form} />
             <Validation className="text-center mt-2" errors={errors} />
             <div className="relative flex w-full flex-col gap-4 rounded-lg bg-neutral-100 dark:bg-neutral-700 text-neutral-500 dark:text-neutral-300  p-4 mt-4">
@@ -62,17 +68,19 @@ const AddLiquidity = ({ data }: AddLiquidityProps): JSX.Element | null => {
                   {stringifyBigWithSignificantDecimals(totalSupplyOfLpTokens, 2)} {data.symbol}
                 </div>
               </div>
-              <div className="flex items-center justify-between">
-                <div>Your pool Share</div>
-                <div>
-                  {depositQuery.data === undefined ? (
-                    <NumberLoader />
-                  ) : (
-                    calcSharePercentage(totalSupplyOfLpTokens, depositQuery.data.preciseBigDecimal)
-                  )}
-                  %
+              {walletAccount && (
+                <div className="flex items-center justify-between">
+                  <div>Your pool Share</div>
+                  <div>
+                    {depositQuery.data === undefined ? (
+                      <NumberLoader />
+                    ) : (
+                      calcSharePercentage(totalSupplyOfLpTokens, depositQuery.data.preciseBigDecimal)
+                    )}
+                    %
+                  </div>
                 </div>
-              </div>
+              )}
             </div>
             <div className="mt-8">
               <TokenApproval
@@ -83,9 +91,13 @@ const AddLiquidity = ({ data }: AddLiquidityProps): JSX.Element | null => {
                 decimalAmount={amountBigDecimal}
                 enabled={submitEnabled}
               >
-                <Button color="primary" className="w-full" type="submit" disabled={!submitEnabled}>
-                  Deposit
-                </Button>
+                {walletAccount ? (
+                  <Button color="primary" className="w-full" type="submit" disabled={!submitEnabled}>
+                    Deposit
+                  </Button>
+                ) : (
+                  <OpenWallet />
+                )}
               </TokenApproval>
               <Button
                 color="secondary"
diff --git a/src/components/nabla/Pools/Swap/Redeem/index.tsx b/src/components/nabla/Pools/Swap/Redeem/index.tsx
index d1728756..c8f24e35 100644
--- a/src/components/nabla/Pools/Swap/Redeem/index.tsx
+++ b/src/components/nabla/Pools/Swap/Redeem/index.tsx
@@ -13,6 +13,8 @@ import { FormProvider } from 'react-hook-form';
 import { TransactionSettingsDropdown } from '../../../common/TransactionSettingsDropdown';
 import { TokenBalance } from '../../../common/TokenBalance';
 import { AmountSelector } from '../../../common/AmountSelector';
+import { useGlobalState } from '../../../../../GlobalStateProvider';
+import OpenWallet from '../../../../Wallet';
 
 export type RedeemLiquidityValues = {
   amount: number;
@@ -27,6 +29,8 @@ const Redeem = ({ data }: RedeemProps): JSX.Element | null => {
   const { toggle, mutation, onSubmit, updateStorage, balanceQuery, depositQuery, amountString, form, withdrawalQuote } =
     useRedeem(data);
 
+  const { walletAccount } = useGlobalState();
+
   const {
     register,
     setValue,
@@ -51,14 +55,16 @@ const Redeem = ({ data }: RedeemProps): JSX.Element | null => {
         </div>
         <FormProvider {...form}>
           <form onSubmit={onSubmit}>
-            <div className="flex justify-between align-end text-sm text-initial my-3">
-              <p>
-                Deposited: <TokenBalance query={depositQuery} symbol={data.symbol}></TokenBalance>
-              </p>
-              <p className="text-neutral-500 text-right">
-                Balance: <TokenBalance query={balanceQuery} symbol={data.backstopPool.token.symbol}></TokenBalance>
-              </p>
-            </div>
+            {walletAccount && (
+              <div className="flex justify-between align-end text-sm text-initial my-3">
+                <p>
+                  Deposited: <TokenBalance query={depositQuery} symbol={data.symbol}></TokenBalance>
+                </p>
+                <p className="text-neutral-500 text-right">
+                  Balance: <TokenBalance query={balanceQuery} symbol={data.backstopPool.token.symbol}></TokenBalance>
+                </p>
+              </div>
+            )}
             <AmountSelector maxBalance={depositQuery.data} formFieldName="amount" form={form}>
               <div className="flex items-center pt-2">
                 <div className="flex items-center justify-between flex-grow mr-2">
@@ -106,17 +112,19 @@ const Redeem = ({ data }: RedeemProps): JSX.Element | null => {
                   {stringifyBigWithSignificantDecimals(totalSupplyOfLpTokens, 2)} {data.symbol}
                 </div>
               </div>
-              <div className="flex items-center justify-between">
-                <div>Your swap pool share</div>
-                <div>
-                  {depositQuery.data === undefined ? (
-                    <NumberLoader />
-                  ) : (
-                    calcSharePercentage(totalSupplyOfLpTokens, depositQuery.data.preciseBigDecimal)
-                  )}
-                  %
+              {walletAccount && (
+                <div className="flex items-center justify-between">
+                  <div>Your swap pool share</div>
+                  <div>
+                    {depositQuery.data === undefined ? (
+                      <NumberLoader />
+                    ) : (
+                      calcSharePercentage(totalSupplyOfLpTokens, depositQuery.data.preciseBigDecimal)
+                    )}
+                    %
+                  </div>
                 </div>
-              </div>
+              )}
             </div>
             <div className="mt-2">
               <div className="text-center">
@@ -133,14 +141,18 @@ const Redeem = ({ data }: RedeemProps): JSX.Element | null => {
                   Withdraw from swap pool
                 </button>
               </div>
-              <Button
-                color="primary"
-                className={`w-full ${withdrawalQuote.isLoading ? 'loading' : ''}`}
-                type="submit"
-                disabled={!submitEnabled}
-              >
-                Redeem
-              </Button>
+              {walletAccount ? (
+                <Button
+                  color="primary"
+                  className={`w-full ${withdrawalQuote.isLoading ? 'loading' : ''}`}
+                  type="submit"
+                  disabled={!submitEnabled}
+                >
+                  Redeem
+                </Button>
+              ) : (
+                <OpenWallet />
+              )}
               <Button
                 color="secondary"
                 className="mt-2 w-full"
diff --git a/src/components/nabla/Pools/Swap/WithdrawLiquidity/index.tsx b/src/components/nabla/Pools/Swap/WithdrawLiquidity/index.tsx
index e7c4fb70..123a7e1a 100644
--- a/src/components/nabla/Pools/Swap/WithdrawLiquidity/index.tsx
+++ b/src/components/nabla/Pools/Swap/WithdrawLiquidity/index.tsx
@@ -12,6 +12,8 @@ import { TransactionProgress } from '../../../common/TransactionProgress';
 import { FormProvider } from 'react-hook-form';
 import { AmountSelector } from '../../../common/AmountSelector';
 import { TokenBalance } from '../../../common/TokenBalance';
+import { useGlobalState } from '../../../../../GlobalStateProvider';
+import OpenWallet from '../../../../Wallet';
 
 export interface WithdrawLiquidityProps {
   data: SwapPoolColumn;
@@ -25,6 +27,8 @@ const WithdrawLiquidity = ({ data }: WithdrawLiquidityProps): JSX.Element | null
     formState: { errors },
   } = form;
 
+  const { walletAccount } = useGlobalState();
+
   const totalSupplyOfLpTokens = rawToDecimal(data.totalSupply, data.token.decimals);
   const backstopBurnIsPossible = BigInt(data.reserve) < BigInt(data.totalLiabilities);
 
@@ -45,14 +49,16 @@ const WithdrawLiquidity = ({ data }: WithdrawLiquidityProps): JSX.Element | null
         </div>
         <FormProvider {...form}>
           <form onSubmit={onSubmit}>
-            <div className="flex justify-between align-end text-sm text-initial my-3">
-              <p>
-                Deposited: <TokenBalance query={depositQuery} symbol={data.symbol}></TokenBalance>
-              </p>
-              <p className="text-neutral-500 text-right">
-                Balance: <TokenBalance query={balanceQuery} symbol={data.token.symbol}></TokenBalance>
-              </p>
-            </div>
+            {walletAccount && (
+              <div className="flex justify-between align-end text-sm text-initial my-3">
+                <p>
+                  Deposited: <TokenBalance query={depositQuery} symbol={data.symbol}></TokenBalance>
+                </p>
+                <p className="text-neutral-500 text-right">
+                  Balance: <TokenBalance query={balanceQuery} symbol={data.token.symbol}></TokenBalance>
+                </p>
+              </div>
+            )}
             <AmountSelector maxBalance={depositQuery.data} formFieldName="amount" form={form}>
               <div className="flex items-center justify-between pt-2">
                 <div>You will withdraw</div>
@@ -67,17 +73,19 @@ const WithdrawLiquidity = ({ data }: WithdrawLiquidityProps): JSX.Element | null
                   {stringifyBigWithSignificantDecimals(totalSupplyOfLpTokens, 2)} {data.symbol}
                 </div>
               </div>
-              <div className="flex items-center justify-between">
-                <div>Your pool share</div>
-                <div>
-                  {depositQuery.data === undefined ? (
-                    <NumberLoader />
-                  ) : (
-                    calcSharePercentage(totalSupplyOfLpTokens, depositQuery.data.preciseBigDecimal)
-                  )}
-                  %
+              {walletAccount && (
+                <div className="flex items-center justify-between">
+                  <div>Your pool share</div>
+                  <div>
+                    {depositQuery.data === undefined ? (
+                      <NumberLoader />
+                    ) : (
+                      calcSharePercentage(totalSupplyOfLpTokens, depositQuery.data.preciseBigDecimal)
+                    )}
+                    %
+                  </div>
                 </div>
-              </div>
+              )}
             </div>
             <div className={backstopBurnIsPossible ? 'mt-2' : 'mt-8'}>
               {backstopBurnIsPossible && (
@@ -96,14 +104,18 @@ const WithdrawLiquidity = ({ data }: WithdrawLiquidityProps): JSX.Element | null
                   </button>
                 </div>
               )}
-              <Button
-                color="primary"
-                className={`w-full ${withdrawalQuote.isLoading ? 'loading' : ''}`}
-                type="submit"
-                disabled={!submitEnabled}
-              >
-                Withdraw
-              </Button>
+              {walletAccount ? (
+                <Button
+                  color="primary"
+                  className={`w-full ${withdrawalQuote.isLoading ? 'loading' : ''}`}
+                  type="submit"
+                  disabled={!submitEnabled}
+                >
+                  Withdraw
+                </Button>
+              ) : (
+                <OpenWallet />
+              )}
               <Button
                 color="secondary"
                 className="mt-2 w-full"
diff --git a/src/components/nabla/Swap/From.tsx b/src/components/nabla/Swap/From.tsx
index f447a077..5581b656 100644
--- a/src/components/nabla/Swap/From.tsx
+++ b/src/components/nabla/Swap/From.tsx
@@ -12,6 +12,7 @@ import { UseContractReadResult } from '../../../hooks/nabla/useContractRead';
 import { ContractBalance } from '../../../helpers/contracts';
 import { TokenBalance } from '../common/TokenBalance';
 import { getIcon } from '../../../shared/AssetIcons';
+import { useGlobalState } from '../../../GlobalStateProvider';
 
 interface FromProps<FormFieldValues extends FieldValues, TFieldName extends FieldPath<FormFieldValues>> {
   fromToken: NablaInstanceToken | undefined;
@@ -32,6 +33,8 @@ export function From<FormFieldValues extends FieldValues, TFieldName extends Fie
 }: FromProps<FormFieldValues, TFieldName>) {
   const { setValue } = useFormContext<SwapFormValues>();
 
+  const { walletAccount } = useGlobalState();
+
   return (
     <div
       className={`rounded-lg bg-base-300 px-4 py-3 border ${inputHasError ? 'border-red-600' : 'border-transparent'}`}
@@ -63,7 +66,7 @@ export function From<FormFieldValues extends FieldValues, TFieldName extends Fie
           {fromToken ? <NablaTokenPrice address={fromToken.id} fallback="$ -" /> : '$ -'}
         </div>
         <div className="flex gap-1 text-sm">
-          {fromTokenBalance !== undefined && (
+          {fromTokenBalance !== undefined && walletAccount && (
             <>
               <span className="mr-1">
                 Your Balance: <TokenBalance query={fromTokenBalance} symbol={fromToken?.symbol}></TokenBalance>
diff --git a/src/components/nabla/Swap/To.tsx b/src/components/nabla/Swap/To.tsx
index df7d0d7d..ec3cf4a0 100644
--- a/src/components/nabla/Swap/To.tsx
+++ b/src/components/nabla/Swap/To.tsx
@@ -15,6 +15,7 @@ import { erc20WrapperAbi } from '../../../contracts/nabla/ERC20Wrapper';
 import { NablaTokenPrice } from '../common/NablaTokenPrice';
 import { Erc20Balance } from '../common/Erc20Balance';
 import { getIcon } from '../../../shared/AssetIcons';
+import { useGlobalState } from '../../../GlobalStateProvider';
 
 export interface ToProps {
   onOpenSelector: () => void;
@@ -36,6 +37,8 @@ export function To({
   const [isOpen, { toggle }] = useBoolean(true);
   const { setValue } = useFormContext<SwapFormValues>();
 
+  const { walletAccount } = useGlobalState();
+
   useEffect(() => {
     setValue('toAmount', toAmountQuote.data?.amountOut.preciseString ?? '0', {
       shouldDirty: true,
@@ -80,15 +83,19 @@ export function To({
       </div>
       <div className="flex justify-between items-center mt-1 dark:text-neutral-300 text-neutral-500">
         <div className="text-sm mt-px">{toToken ? <NablaTokenPrice address={toToken.id} fallback="$ -" /> : '$ -'}</div>
-        <div className="flex gap-1 text-sm">
-          Your balance:{' '}
-          <Erc20Balance
-            abi={erc20WrapperAbi}
-            erc20ContractDefinition={
-              toToken ? { contractAddress: toToken.id, decimals: toToken.decimals, symbol: toToken.symbol } : undefined
-            }
-          />
-        </div>
+        {walletAccount && (
+          <div className="flex gap-1 text-sm">
+            Your balance:{' '}
+            <Erc20Balance
+              abi={erc20WrapperAbi}
+              erc20ContractDefinition={
+                toToken
+                  ? { contractAddress: toToken.id, decimals: toToken.decimals, symbol: toToken.symbol }
+                  : undefined
+              }
+            />
+          </div>
+        )}
       </div>
       <div className="mt-4 h-px -mx-4 bg-[rgba(0,0,0,0.15)]" />
       <div
diff --git a/src/components/nabla/common/TokenApproval.tsx b/src/components/nabla/common/TokenApproval.tsx
index d1afd1f1..6a621d7b 100644
--- a/src/components/nabla/common/TokenApproval.tsx
+++ b/src/components/nabla/common/TokenApproval.tsx
@@ -4,6 +4,7 @@ import { Big } from 'big.js';
 
 import { ApprovalState, useErc20TokenApproval } from '../../../hooks/nabla/useErc20TokenApproval';
 import { multiplyByPowerOfTen } from '../../../shared/parseNumbers/metric';
+import OpenWallet from '../../Wallet';
 
 export type TokenApprovalProps = ButtonProps & {
   token: string;
@@ -50,15 +51,11 @@ export function TokenApproval({
 
   const isDisabled = isNoAccount || isApprovalPending || disabled || !decimalAmount;
 
-  const buttonText = isNoAccount
-    ? 'Please connect your wallet'
-    : isApprovalPending
-      ? 'Approving'
-      : isLoading
-        ? 'Loading'
-        : 'Approve';
+  const buttonText = isApprovalPending ? 'Approving' : isLoading ? 'Loading' : 'Approve';
 
-  return (
+  return isNoAccount ? (
+    <OpenWallet />
+  ) : (
     <Button
       className={`w-full ${className}`}
       color="primary"
diff --git a/src/index.css b/src/index.css
index 1743ed0f..dca288c6 100644
--- a/src/index.css
+++ b/src/index.css
@@ -385,3 +385,12 @@ w3m-modal {
   white-space: nowrap;
   border-width: 0;
 }
+
+/* Fix wallet select modal to allow for scrolling */
+#react-portal-modal-container main {
+  overflow-y: auto;
+}
+
+#react-portal-modal-container > div > div {
+  max-height: 90vh;
+}
diff --git a/src/pages/bridge/Issue/index.tsx b/src/pages/bridge/Issue/index.tsx
index 6e183083..efb941bc 100644
--- a/src/pages/bridge/Issue/index.tsx
+++ b/src/pages/bridge/Issue/index.tsx
@@ -64,7 +64,7 @@ function Issue(props: IssueProps): JSX.Element {
 
   const navigateTo = useNavigate();
   const { createIssueRequestExtrinsic, getIssueRequest } = useIssuePallet();
-  const { walletAccount, dAppName, tenantName } = useGlobalState();
+  const { walletAccount, tenantName } = useGlobalState();
   const { api, tokenSymbol } = useNodeInfoState().state;
   const { selectedVault, selectedAsset, setSelectedAsset, wrappedAssets } = useBridgeSettings();
   const { issueGriefingCollateral } = useFeePallet().getFees();
@@ -248,7 +248,7 @@ function Issue(props: IssueProps): JSX.Element {
               Bridge
             </Button>
           ) : (
-            <OpenWallet dAppName={dAppName} />
+            <OpenWallet />
           )}
           <Disclaimer content={disclaimerContent} />
         </form>
diff --git a/src/pages/bridge/Redeem/index.tsx b/src/pages/bridge/Redeem/index.tsx
index 067479cb..b63c5a72 100644
--- a/src/pages/bridge/Redeem/index.tsx
+++ b/src/pages/bridge/Redeem/index.tsx
@@ -194,7 +194,7 @@ function Redeem(props: RedeemProps): JSX.Element {
               Bridge
             </Button>
           ) : (
-            <OpenWallet dAppName={dAppName} />
+            <OpenWallet />
           )}
         </form>
       </div>
diff --git a/src/pages/gas/SubmitButton.tsx b/src/pages/gas/SubmitButton.tsx
index 65971c6a..b99d5fe4 100644
--- a/src/pages/gas/SubmitButton.tsx
+++ b/src/pages/gas/SubmitButton.tsx
@@ -20,7 +20,7 @@ export const SubmitButton = ({ loading, disabled }: { loading?: boolean; disable
           {tokenSymbol && !loading ? `Get ${tokenSymbol}` : ''}
         </Button>
       ) : (
-        <OpenWallet dAppName={dAppName} />
+        <OpenWallet />
       )}
     </>
   );