diff --git a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte
index 3f3122d60d..afdc3d2f30 100644
--- a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte
@@ -208,6 +208,7 @@
 
   // Toggles whether a row is included in the relationship or not
   const toggleRow = async row => {
+    hideRelationshipFields()
     if (fieldValue?.some(x => x._id === row._id)) {
       // If the row is already included, remove it and update the candidate
       // row to be the same position if possible
@@ -363,7 +364,12 @@
 {/if}
 
 {#if showRelationshipFields}
-  <GridPopover anchor={relationshipAnchor} maxWidth={400} offset={4}>
+  <GridPopover
+    anchor={relationshipAnchor}
+    maxWidth={400}
+    offset={4}
+    clickOutsideOverride
+  >
     <div class="relationship-fields">
       {#each Object.entries(relationshipFields) as [fieldName, fieldValue]}
         <div class="relationship-field-name">
diff --git a/packages/frontend-core/src/components/grid/overlays/GridPopover.svelte b/packages/frontend-core/src/components/grid/overlays/GridPopover.svelte
index 80647a494e..dcbcb0fc23 100644
--- a/packages/frontend-core/src/components/grid/overlays/GridPopover.svelte
+++ b/packages/frontend-core/src/components/grid/overlays/GridPopover.svelte
@@ -16,6 +16,7 @@
   export let resizable = false
   export let wrap = true
   export let offset = 0
+  export let clickOutsideOverride
 
   const { gridID } = getContext("grid")
   const dispatch = createEventDispatcher()
@@ -44,6 +45,7 @@
   {resizable}
   {wrap}
   {offset}
+  {clickOutsideOverride}
   portalTarget="#{gridID} .grid-popover-container"
 >
   <div