diff --git a/apps/namadillo/src/App/Masp/ShieldedAssetTable.tsx b/apps/namadillo/src/App/Masp/ShieldedAssetTable.tsx
index 912030e5a0..a6cf6c1d90 100644
--- a/apps/namadillo/src/App/Masp/ShieldedAssetTable.tsx
+++ b/apps/namadillo/src/App/Masp/ShieldedAssetTable.tsx
@@ -6,7 +6,7 @@ import {
   shieldedTokensAtom,
 } from "atoms/balance/atoms";
 import { useAtomValue } from "jotai";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { ShieldedFungibleTable } from "./ShieldedFungibleTable";
 import { ShieldedNFTTable } from "./ShieldedNFTTable";
@@ -31,11 +31,17 @@ const ShieldAssetCta = (): JSX.Element => {
 
 export const ShieldedAssetTable = (): JSX.Element => {
   const [tab, setTab] = useState(tabs[0]);
+  const { refetch: refetchShieldedTokens } = useAtomValue(shieldedTokensAtom);
   const shieldedTokensQuery = useAtomValue(shieldedTokensAtom);
   const shielededTokensRewardsEstQuery = useAtomValue(
     shieldedRewardsPerTokenAtom
   );
 
+  // Refetch shielded tokens on mount
+  useEffect(() => {
+    refetchShieldedTokens();
+  }, []);
+
   if (shieldedTokensQuery.data === undefined) {
     return <SkeletonLoading height="125px" width="100%" />;
   }
diff --git a/apps/namadillo/src/App/Swap/SwapInProgress.tsx b/apps/namadillo/src/App/Swap/SwapInProgress.tsx
index adc6ba57a3..eb3c46a124 100644
--- a/apps/namadillo/src/App/Swap/SwapInProgress.tsx
+++ b/apps/namadillo/src/App/Swap/SwapInProgress.tsx
@@ -20,6 +20,8 @@ export const SwapInProgress = (): JSX.Element => {
       status.txHash &&
       tx.hash === status.txHash
     ) {
+      // TODO: Handle this elswhere, because if we change view before the disposable
+      // signer won't be cleared
       await clearDisposableSigner(tx.refundTarget);
       setStatus({ t: "Completed" });
     }
diff --git a/apps/namadillo/src/App/Swap/SwapSelectAssetModal.tsx b/apps/namadillo/src/App/Swap/SwapSelectAssetModal.tsx
index 16bf73abf6..2d7f89c84d 100644
--- a/apps/namadillo/src/App/Swap/SwapSelectAssetModal.tsx
+++ b/apps/namadillo/src/App/Swap/SwapSelectAssetModal.tsx
@@ -43,12 +43,13 @@ export const SwapSelectAssetModal = ({
           asset.name.toLowerCase().indexOf(filter.toLowerCase()) >= 0 ||
           asset.symbol.toLowerCase().indexOf(filter.toLowerCase()) >= 0
       )
-      // We temporarily hide stride assets until we support them fully
+      // We temporarily hide stride and um assets until we support them fully
       .filter(
         (asset) =>
           !asset.traces?.find(
             (trace) =>
-              trace.type === "ibc" && trace.counterparty.chain_name === "stride"
+              trace.type === "ibc" &&
+              ["stride", "penumbra"].includes(trace.counterparty.chain_name)
           )
       );
 
diff --git a/apps/namadillo/src/hooks/useTransactionNotifications.tsx b/apps/namadillo/src/hooks/useTransactionNotifications.tsx
index 2b92bf636a..d0eb8d206b 100644
--- a/apps/namadillo/src/hooks/useTransactionNotifications.tsx
+++ b/apps/namadillo/src/hooks/useTransactionNotifications.tsx
@@ -576,7 +576,11 @@ export const useTransactionNotifications = (): void => {
               symbol={tx.targetAsset.symbol}
             />
           </b>{" "}
-          has completed
+          has completed.
+          <br />
+          <b>Note:</b> your balance may not immediately reflect this. If
+          that&apos;s the case, plase wait a few seconds and refresh your
+          balance.
         </>
       ),
       type: "success",