diff --git a/packages/lib/common/SideMenu/SideMenuNav/index.tsx b/packages/lib/common/SideMenu/SideMenuNav/index.tsx
index 7d497a69..7eac739c 100644
--- a/packages/lib/common/SideMenu/SideMenuNav/index.tsx
+++ b/packages/lib/common/SideMenu/SideMenuNav/index.tsx
@@ -1,6 +1,7 @@
 import {cloneElement, Fragment, type ReactElement, useCallback, useEffect, useState} from 'react';
 import Link from 'next/link';
 import {usePathname} from 'next/navigation';
+import {useRouter} from 'next/router';
 import {usePlausible} from 'next-plausible';
 import {motion} from 'framer-motion';
 import {useWeb3} from '@builtbymom/web3/contexts/useWeb3';
@@ -10,6 +11,7 @@ import {LinkOrDiv} from '@lib/common/LinkOrDiv';
 import {useIsMounted} from '@lib/hooks/useIsMounted';
 import {IconChevron} from '@lib/icons/IconChevron';
 import {CurtainContent} from '@lib/primitives/Curtain';
+import {isInIframe} from '@lib/utils/helpers';
 import {PLAUSIBLE_EVENTS} from '@lib/utils/plausible';
 
 export type TSideMenuItem = {
@@ -28,6 +30,7 @@ type TNavItemProps = {
 	isDisabled?: boolean;
 	onClick?: () => void;
 };
+
 function NavItem({
 	label,
 	href,
@@ -37,12 +40,30 @@ function NavItem({
 	hasSubmenu,
 	isDisabled = false
 }: TNavItemProps): ReactElement {
+	const router = useRouter();
+
+	/******************************************************************************
+	 ** Handle navigation within Safe app context by updating the appUrl query param
+	 ** while preserving the existing Safe context and other query parameters
+	 *****************************************************************************/
+	const goToSafeApp = useCallback(() => {
+		const url = {
+			pathname: router.pathname,
+			query: {
+				...router.query,
+				appUrl: href
+			}
+		};
+		router.replace(url);
+	}, [href, router]);
+
 	return (
 		<motion.li className={'relative z-10 px-4 md:px-2 lg:px-4'}>
 			<LinkOrDiv
 				href={hasSubmenu ? href : href}
 				isDisabled={isDisabled}
-				onClick={onClick}>
+				target={'_self'}
+				onClick={href === 'https://v1.smold.app/stream' && isInIframe() ? goToSafeApp : onClick}>
 				<div
 					className={cl(
 						'flex items-center gap-2 justify-between rounded-3xl px-4 py-2 transition-colors w-full',
diff --git a/packages/lib/utils/helpers.ts b/packages/lib/utils/helpers.ts
index 48741bb7..12a9a906 100644
--- a/packages/lib/utils/helpers.ts
+++ b/packages/lib/utils/helpers.ts
@@ -45,3 +45,7 @@ export function truncateHexTx(hash: string | undefined, size: number): string {
 	}
 	return `0x${ZERO_ADDRESS.slice(2, size)}...${ZERO_ADDRESS.slice(-size)}`;
 }
+
+export function isInIframe(): boolean {
+	return typeof window !== 'undefined' && window.self !== window.top;
+}
diff --git a/packages/smol/components/Wallet/index.tsx b/packages/smol/components/Wallet/index.tsx
index 55b7fe95..7b18029a 100644
--- a/packages/smol/components/Wallet/index.tsx
+++ b/packages/smol/components/Wallet/index.tsx
@@ -112,6 +112,7 @@ export function Wallet(): ReactElement {
 			return filteredTokens.map(token => (
 				<Link
 					className={'w-full'}
+					key={`${token.address}_${token.chainID}`}
 					href={`/apps/send?tokens=${token.address}&values=${token.balance.raw}`}>
 					<SmolTokenButton
 						key={`${token.address}_${token.chainID}`}
diff --git a/packages/smol/pages/_app.tsx b/packages/smol/pages/_app.tsx
index da01d4e7..13ac90d5 100755
--- a/packages/smol/pages/_app.tsx
+++ b/packages/smol/pages/_app.tsx
@@ -8,7 +8,14 @@ import {WithFonts} from '@lib/common/WithFonts';
 import {IndexedDB} from '@lib/contexts/useIndexedDB';
 import {WithPopularTokens} from '@lib/contexts/usePopularTokens';
 import {WithPrices} from '@lib/contexts/usePrices';
-import {IconAppAddressBook, IconAppDisperse, IconAppRevoke, IconAppSend, IconAppSwap} from '@lib/icons/IconApps';
+import {
+	IconAppAddressBook,
+	IconAppDisperse,
+	IconAppRevoke,
+	IconAppSend,
+	IconAppStream,
+	IconAppSwap
+} from '@lib/icons/IconApps';
 import {IconCheck} from '@lib/icons/IconCheck';
 import {IconCircleCross} from '@lib/icons/IconCircleCross';
 import {IconClone} from '@lib/icons/IconClone';
@@ -70,6 +77,11 @@ const MENU = [
 				icon: <IconClone />
 			}
 		]
+	},
+	{
+		href: 'https://v1.smold.app/stream',
+		label: 'Stream',
+		icon: <IconAppStream />
 	}
 	// {
 	// 	href: '/apps/earn',
@@ -77,12 +89,6 @@ const MENU = [
 	// 	isDisabled: true,
 	// 	icon: <IconAppEarn />
 	// },
-	// {
-	// 	href: '/apps/stream',
-	// 	label: 'Stream',
-	// 	isDisabled: true,
-	// 	icon: <IconAppStream />
-	// }
 ];
 
 function MyApp(props: AppProps): ReactElement {