diff --git a/src/components/Activity.tsx b/src/components/Activity.tsx
index d0b9d31..ff625cd 100644
--- a/src/components/Activity.tsx
+++ b/src/components/Activity.tsx
@@ -185,6 +185,25 @@ export function UnifiedActivityItem(props: {
         }
     };
 
+    function handlePrimaryOnClick() {
+        if (primaryContact()?.id) {
+            navigate(`/chat/${primaryContact()?.id}`);
+            return;
+        }
+
+        if (profileFromNostr()) {
+            props.onNewContactClick(profileFromNostr()!);
+            return;
+        }
+
+        if (
+            props.item.kind === "ChannelOpen" ||
+            props.item.kind === "ChannelClose"
+        ) {
+            click();
+        }
+    }
+
     return (
         <div class="pt-3 first-of-type:pt-0">
             <Suspense
@@ -218,13 +237,7 @@ export function UnifiedActivityItem(props: {
                             : profileFromNostr()?.primal_image_url || ""
                     }
                     icon={shouldShowShuffle() ? <Shuffle /> : undefined}
-                    primaryOnClick={() =>
-                        primaryContact()?.id
-                            ? navigate(`/chat/${primaryContact()?.id}`)
-                            : profileFromNostr()
-                              ? props.onNewContactClick(profileFromNostr()!)
-                              : undefined
-                    }
+                    primaryOnClick={handlePrimaryOnClick}
                     amountOnClick={click}
                     primaryName={
                         props.item.inbound
diff --git a/src/components/GenericItem.tsx b/src/components/GenericItem.tsx
index 45441d6..8f55c08 100644
--- a/src/components/GenericItem.tsx
+++ b/src/components/GenericItem.tsx
@@ -43,7 +43,9 @@ export function GenericItem(props: {
                     <Match when={props.icon}>
                         <button
                             class="flex h-[3rem] w-[3rem] items-center justify-center"
-                            onClick={() => props.primaryOnClick}
+                            onClick={() =>
+                                props.primaryOnClick && props.primaryOnClick()
+                            }
                         >
                             {props.icon}
                         </button>
diff --git a/src/routes/setup/AddFederation.tsx b/src/routes/setup/AddFederation.tsx
index 20867ae..5841a4a 100644
--- a/src/routes/setup/AddFederation.tsx
+++ b/src/routes/setup/AddFederation.tsx
@@ -6,8 +6,7 @@ import {
     ConfirmDialog,
     DefaultMain,
     ExternalLink,
-    MutinyWalletGuard,
-    VStack
+    MutinyWalletGuard
 } from "~/components";
 import { useI18n } from "~/i18n/context";