diff --git a/src/routes/console/account/payments/billingAddress.svelte b/src/routes/console/account/payments/billingAddress.svelte
index 807fa9ee5..99187e77d 100644
--- a/src/routes/console/account/payments/billingAddress.svelte
+++ b/src/routes/console/account/payments/billingAddress.svelte
@@ -28,7 +28,7 @@
     let showDelete = false;
     let showDropdown = [];
     let countryList: Models.CountryList;
-    let showLinked = false;
+    let showLinked = [];
 
     onMount(async () => {
         countryList = await sdk.forProject.locale.listCountries();
@@ -76,8 +76,10 @@
                             </TableCell>
                             <TableCell style="vertical-align: top;">
                                 {#if linkedOrgs?.length > 0}
-                                    <DropList bind:show={showLinked} width="20" scrollable>
-                                        <Pill button on:click={() => (showLinked = !showLinked)}>
+                                    <DropList bind:show={showLinked[i]} width="20" scrollable>
+                                        <Pill
+                                            button
+                                            on:click={() => (showLinked[i] = !showLinked[i])}>
                                             <span class="icon-info" /> linked to organization
                                         </Pill>
                                         <svelte:fragment slot="list">
diff --git a/src/routes/console/account/payments/paymentMethods.svelte b/src/routes/console/account/payments/paymentMethods.svelte
index ae3ee9744..e8f4c479a 100644
--- a/src/routes/console/account/payments/paymentMethods.svelte
+++ b/src/routes/console/account/payments/paymentMethods.svelte
@@ -33,7 +33,7 @@
     let showDelete = false;
     let showEdit = false;
     let isLinked = false;
-    let showLinked = false;
+    let showLinked = [];
 
     $: orgList = $organizationList.teams as unknown as Organization[];
 
@@ -68,10 +68,14 @@
                                 <CreditCardInfo {paymentMethod}>
                                     <div class="u-flex u-gap-16 u-cross-center">
                                         {#if linkedOrgs?.length > 0}
-                                            <DropList bind:show={showLinked} width="20" scrollable>
+                                            <DropList
+                                                bind:show={showLinked[i]}
+                                                width="20"
+                                                scrollable>
                                                 <Pill
                                                     button
-                                                    on:click={() => (showLinked = !showLinked)}>
+                                                    on:click={() =>
+                                                        (showLinked[i] = !showLinked[i])}>
                                                     <span class="icon-info" /> linked to organization
                                                 </Pill>
                                                 <svelte:fragment slot="list">