diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
index e7803f9247..acad8b8970 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte
@@ -137,14 +137,16 @@
                         {#if 'format' in attribute && attribute.format}
                             <span class="u-capitalize">{attribute.format}</span>
                         {:else}
-                            <span class="u-capitalize">{attribute.type}</span>
-                            {#if isRelationship(attribute)}
-                                <span>
-                                    with <a
-                                        href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${attribute?.relatedCollection}`}
-                                        ><b data-private>{attribute?.key}</b></a>
-                                </span>
-                            {/if}
+                            <p>
+                                <span class="u-capitalize">{attribute.type}</span>
+                                {#if isRelationship(attribute)}
+                                    <span>
+                                        with <a
+                                            href={`${base}/project-${page.params.region}-${page.params.project}/databases/database-${databaseId}/collection-${attribute?.relatedCollection}`}
+                                            ><b data-private>{attribute?.key}</b></a>
+                                    </span>
+                                {/if}
+                            </p>
                         {/if}
                         <span>
                             {attribute.array ? '[]' : ''}
@@ -167,12 +169,13 @@
                                 <Button text icon ariaLabel="more options" on:click={toggle}>
                                     <Icon icon={IconDotsHorizontal} size="s" />
                                 </Button>
-                                <ActionMenu.Root slot="tooltip">
+                                <ActionMenu.Root slot="tooltip" let:toggle>
                                     <ActionMenu.Item.Button
                                         leadingIcon={IconPencil}
-                                        on:click={() => {
-                                            selectedAttribute = attribute;
+                                        on:click={(event) => {
+                                            toggle(event);
                                             showEdit = true;
+                                            selectedAttribute = attribute;
                                             showDropdown[index] = false;
                                         }}>
                                         Update
@@ -180,7 +183,8 @@
                                     {#if !isRelationship(attribute)}
                                         <ActionMenu.Item.Button
                                             leadingIcon={IconPlus}
-                                            on:click={() => {
+                                            on:click={(event) => {
+                                                toggle(event);
                                                 selectedAttribute = attribute;
                                                 showCreateIndex = true;
                                                 showDropdown[index] = false;
@@ -191,10 +195,11 @@
                                     {#if attribute.status !== 'processing'}
                                         <ActionMenu.Item.Button
                                             leadingIcon={IconTrash}
-                                            on:click={() => {
-                                                selectedAttribute = attribute;
+                                            on:click={(event) => {
+                                                toggle(event);
                                                 showDelete = true;
                                                 showDropdown[index] = false;
+                                                selectedAttribute = attribute;
                                                 trackEvent(Click.DatabaseAttributeDelete);
                                             }}>
                                             Delete
diff --git a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
index d9007b1967..da920f4e77 100644
--- a/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
+++ b/src/routes/(console)/project-[region]-[project]/databases/database-[database]/collection-[collection]/attributes/relationship.svelte
@@ -11,10 +11,12 @@
         data: Partial<Models.AttributeRelationship>
     ) {
         if (!isValueOfStringEnum(RelationshipType, data.relationType)) {
-            throw new Error(`Invalid relationship type: ${data.relationType}`);
+            throw new Error(
+                `Invalid relationship type${data.relationType ? ` : ${data.relationType}` : ''}`
+            );
         }
         if (!isValueOfStringEnum(RelationMutate, data.onDelete)) {
-            throw new Error(`Invalid on delete: ${data.onDelete}`);
+            throw new Error(`Invalid deletion method${data.onDelete ? ` : ${data.onDelete}` : ''}`);
         }
 
         await sdk
@@ -137,7 +139,7 @@
     $: search = data.relatedCollection || undefined;
 
     $: if (search) {
-        const exists = collectionList.collections?.some((c) =>
+        const exists = collectionList?.collections?.some((c) =>
             c.$id.toLocaleLowerCase().includes(search.toLocaleLowerCase())
         );
 
@@ -157,7 +159,7 @@
         name="one"
         value="one"
         icon={IconArrowSmRight}>
-        <p>One Relation attribute within this collection</p>
+        One Relation attribute within this collection
     </Card.Selector>
     <Card.Selector
         title="Two-way relationship"
@@ -165,9 +167,7 @@
         name="two"
         value="two"
         icon={IconSwitchHorizontal}>
-        <p>
-            One Relation attribute within this collection and another within the related collection
-        </p>
+        One Relation attribute within this collection and another within the related collection
     </Card.Selector>
 </Layout.Stack>
 
@@ -179,6 +179,7 @@
     bind:value={data.relatedCollection}
     on:change={updateKeyName}
     options={collections?.map((n) => ({ value: n.$id, label: `${n.name} (${n.$id})` })) ?? []} />
+
 {#if data?.relatedCollection}
     <InputText
         id="key"
@@ -207,6 +208,7 @@
         placeholder="Select a relation"
         options={relationshipType}
         disabled={editing} />
+
     <div class="u-flex u-flex-vertical u-gap-16">
         <Box>
             <div class="u-flex u-align u-cross-center u-main-center u-gap-32">
@@ -214,7 +216,7 @@
                 {#if data.twoWay}
                     <img src={arrowTwo} alt={'Two way relationship'} />
                 {:else}
-                    <img src={arrowOne} alt={'One way realationship'} />
+                    <img src={arrowOne} alt={'One way relationship'} />
                 {/if}
                 <span>{data.key}</span>
             </div>