diff --git a/src/components/UnlockModal/UnlockModal.tsx b/src/components/UnlockModal/UnlockModal.tsx
index fb1b5a5..501660c 100644
--- a/src/components/UnlockModal/UnlockModal.tsx
+++ b/src/components/UnlockModal/UnlockModal.tsx
@@ -419,6 +419,10 @@ export default function UnlockModal() {
 
               {amountValid && (
                 <Box border="1px solid #303030" borderRadius="2xl" p={3}>
+                  {infoRow(
+                    "Estimated receive",
+                    `${numericAmount.toFixed(4)} ${position.symbol}`,
+                  )}
                   {infoRow(
                     "Remaining stake",
                     `${remainingStake.toFixed(4)} ${position.symbol}`,
diff --git a/src/context/StellarWalletContext.tsx b/src/context/StellarWalletContext.tsx
index 91e494d..881ec05 100644
--- a/src/context/StellarWalletContext.tsx
+++ b/src/context/StellarWalletContext.tsx
@@ -220,6 +220,44 @@ export function StellarWalletProvider({ children }: { children: ReactNode }) {
     setNetworkName(null);
   }, []);
 
+  // Periodic health check for Freighter extension (#222)
+  useEffect(() => {
+    if (!publicKey) return undefined;
+
+    const checkFreighterHealth = async () => {
+      try {
+        const freighter = await import("@stellar/freighter-api");
+        const connected = await freighter.isConnected();
+        
+        // If extension is no longer available, disconnect gracefully
+        if (!connected.isConnected || connected.error) {
+          disconnect();
+          return;
+        }
+
+        // Verify we can still get the address
+        const addr = await freighter.getAddress();
+        if (addr.error || !addr.address) {
+          disconnect();
+          return;
+        }
+
+        // If address changed, update it
+        if (addr.address !== publicKey) {
+          setPublicKey(addr.address);
+        }
+      } catch {
+        // Extension error or removal - disconnect
+        disconnect();
+      }
+    };
+
+    // Check every 30 seconds
+    const interval = setInterval(checkFreighterHealth, 30000);
+    
+    return () => clearInterval(interval);
+  }, [publicKey, disconnect]);
+
   // NOTE: this listener does not fire when a user opens the Freighter
   // extension popup while this tab stays visible — extension popups are a
   // separate top-level browsing context, not an overlay that hides the